Refactor

Removed old classes and print statements