Cleanups for status and stop in dispatcher.rc