Cleaned up classes, removed most un-used methods, variables, and so forth