Clean up Riemann solver