Revert "Parser 3"

This reverts commit fc0a886adf06f39e1f92fd92db52e064fbc212b8.