Cleanup imports after initial merge