Remove circle dependency