nothing new should be added on this branch; it is delete-only