Remove comment
Add primary key to db