Use non-shifting remove