Final cleanup in moving changes back to Poisson solver.
Final cleanup in moving changes back to Poisson solver.