Deprecated a few more things