Clean up some more depreciated stuff