new cleanup upgrader