More simplification work