Remove commented out code, and style imports.