Removed unnecessary classes, and did some small cleanup.