Remove uniqueness constraint check

Fixes #2211

Please review