accidentally let those removed solves creep back from merge