cleanup deprecation warnings