Fix removal of untagged dives