Cleaning up after name -> id switch