Cleared up some warnings

Removed unused imports and code