partial commit of simplification