Update notBasic grammar, remove some verbose grammar