change from findAndRemove() to just remove()