Removing X Waiver Is Not Enough