Merge "Code cleanup. Fixes most of the IDE warnings"