add ordering
Merge pull request #927 from xdel/remove-singleshot-cleanup

add ordering for neutron cleanup