Remove cyclic package dependency