2.1

Removed unused imports and dead coce