Bug/revert database creation