Clean up dispatcher and it's spec