Simplifier cleanup