CODE CLEANUP SOLVER