Solver cleanup. Should not need to edit this file again