unused imports and code cleaned up