Further progress in cleaning commands.