Remove unused classes and clean