Removing foreign key that was merged in from another branch
Merge branch 'rename-database-relations'