Remove global circular imports