General cleaning pass 2 and shift selection