Removed old code that accidentally made its way to the repository
Cleaned up imports