Cleaned up classes, removed unused files.