Remove global circular import