Non-OC code cleanup

Check out my comments by clicking on the Files changed tab.

Besides what I describe there, I also removed any dead code I saw (unused imports, unused methods, etc.)