d710: remove stale keylayout annotations