more cleanup on stop
smarter, simpler reaper