Remove deprecated

Problem/Motivation

There are deprecated items.

Steps to reproduce

Proposed resolution

Remove in 2.0.x branch

Remaining tasks

User interface changes

API changes

Data model changes