remove more compat code
13 files changed