Remove more compat version references and deprecate some stuff.