Switch order so removals happen before max_ver detection