adding remove, fixing circular deps