Removed surrogate primary keys