remove more code for older lexical access scheme