trying to cleanup the deprecation warnings