Deprecate a few more things before we launch v2 (#348)

9 files changed