remove controlTypes deprecations (#13377)
Remove code deprecated in #12510
Summary of the issue:
Deprecated code needed to be removed from the API proposed in #12510
Description of how this pull request fixes the issue:
Commits to the API proposed in #12510