unutilised parser removed
Merge branch 'hotfix/parser-refactor'