minor keyWait cleanup