remove unused classes
Core Data project refactoring and fixing