Remove deprecations.
jesos changes