[enhancement] removing useless block, using node in parser