Some simplifications