Removed unused imports
Fix for Adam's bug