clean up some obvious deprecation warnings