Remove obsolete backwards support code