Removed some unused module imports left behind from extracted submodules.