changed some of the cleanup step ordering for more convenient requeuing. This is the version I will launch post hall03 queue fix.