Get rid of name uniqueness code that didn't work and wasn't used
Merge branch 'master' into displays