Code cleanup

Removed unnecessary imports and deleted commented out test code