BS-9998 Change clean expression to use the already existing one in the
ExpressionHelper. Update and add test.