Eliminate extra grammar