Revert "Improved Parser"

This reverts commit 6239601272546408be877d245ba79c975af00cb6.