Clean up and optimized imports