Award-winning super pull request

Only 64 files changed :D 
(Removing unused imports, spaces, etc.)