Revert "Reworked Database stuff to be Datastore stuff"

This reverts commit ebd00184734771ac48e8d75a5334a70a9ee4c84e.