While these were being cancelled already - we can still tidy into the extensions. When they were added we were competing on edits...now that we're clear we can do that cleanup pass.