Fixed Warnings

Removed unused import statements
Removed uncommented code
Removed unused code