Further simplifications