Bring back simplify, turns out it's needed
Getting changesets working