Remove a bunch of deprecation warnings