Solver tidy up. Remove unnecessary function arguments