cleanup deprecations / warnings