SONARDOTNT-321 Remove some useless trailing comments in the grammar