General code cleaning

Unused imports and all that