Remove unused/unnecessary classes