Clean-up Numerical code.