removed some unused bindings
Removed unused imports
Tidying