Remove unused imports
Merge branch 'developer-polish' of github.com:djkirby/wpi-suite-tng into developer-polish
Persisting package issue