Parser improvements
Removed old parser