Optimize imports & cleanup