Remove unused imports and cleanup