simplify gh-22