Removing unnecessary macro from grammar