Cleanup - remove unused imports