APPSMALL-549: comment cleanup