Some simplifications (breaking commit)