Removed some unused classes as well as added nots to Sync on things that need to be done