Removed unused import
Less code
Removed useless code