Changes to deprecation policies and API spring cleaning

:

: 3