added removeByType