Remove circular import reference