made findAndRemove more explisit