Part 1 - Removed old classes not being used