Removed unused imports
Minor changes to Hub