Cleanup from efficiency hacking
Added tagging of SolveActions