delete grammar parser, move to grammar class