#784 Remove some parser features