Clean up dispatch startup and access