Cleanup unused classes