Remove deprecated code, enable previous soft deprecations