Revert "Parser with P"

This reverts commit f534e62eed639b3a435a7dfc84a7c1cebadd8266.