remove xy_solver + cleanup