Cleanup and fix

Clean up all imports being placed in the code.
Fixed a duplication message