Fix ConcurentModificationException thrown when removing axes choices