Removed old parser code