Removing unused classes & clearing up code