2.1 cleanup + upgrades