put in different remove methods for iterator and class