Removes unused classes
Fixes imports