Updated for new grammar
Modify unused variables to underscores