remove IDs which had become unnecessary
Merge branch 'ang'

* ang:
  remove IDs which had become unnecessary