Code Clean up: Remove unused imports