Remove circular dependenies