another round of simplifications