Removed some unused code
Removed unused import