Fixed unused use statements
Removed commented code