Removed deprecated definitions here.
Removed deprecated definitions where it was easy

In other cases the deprecated annotation seems to be more of a FIXME