Revert "Parsing and Advanced Buttons"

This reverts commit 7d5dc4c6d8596a6da94fe677112824e78cea5562.