Revert "Database changes"

This reverts commit 5a37a8bd43fd09b07957ab31a01a848a1de66016.
Changed Database again
Merge remote-tracking branch 'origin/master'