Remove some unused id referrences, update some comments