Remove obsolete compatibility workarounds