Fixing name duplicates and deleting unused classes