Remove unnecessary WITH parse analysis steps
Remove obsolete comment