Remove the last traces of 2.9 specific code.