Removed unused imports
Remove commented code