Cleaned Unused Classes

Cleaning Stuff Up!