Remove hard-coded CTRL_MASK