Removed non-unique IDs (they weren't used anyway AFAIK)