Cleanups for the Dispatcher and Bootstrap