Remove comments on gift message
Merge branch 'feature/nw-remove-comments'