Further simplification and clean up around the linear system solvers.