Starting on removing bot pkg deprecations