new cleanup upgrader, further upgrade work, addional improvements for ops