[heise] Simplify (#3842)