simplify changeset