Removes unnecessary imports
Removes tests from save files
Merge branch 'importcleanup' into develop

Cleans up imports. Main UI and individual windows can both be created without raising exceptions.