Removed old code
Removed unused imports and variables
Removed additional unused imports