Simplify things a bit and regenerate everything