BUG-865: remove old parser remnants