Remove more derprecations. :)