More simplifications