Removed unused imports and removed TO DO