Removed requirement of a primary key. General cleanup.