Tidy up imports
Removed a couple of println and added a comment about fix