Simplifications and cleaning