Cleaned up a bunch of warnings

Just cleaning. Got rid of some unused files and erased unused imports.