JCR-2022: Cleanup the document by applying the given remarks

JCR-2022: Cleanup the document by applying the given remarks