Tune: Drop old compat code