modify: get rid of unused keyword mechanism