Cleaned up redundant class definitions and fixed methods that refer to the class