Adding back the cleanup processes
Going back to the previous omnibus-software version