Removed unused imports to fix make error