Complete removal/refactoring of conditional deprecations.