check removal throughout?