Remove deprecations.

I left these in as there were low cost and names people would be familliar with.