First cleaning wave: remove unused imports, classes