GUI-554: Remove unused imports
GUI-554: Remove unused imports.  Misc PEP8 cleanup.  Marked broken references with FIXME comments