more code cleanup
Bug fix, corrected broken imports