Clean up Parser - remove some old dead code