Removed unused classes, organized all imports, fixed some merge errors