Simplify/rewrite history