Revert "New Data Base Class"

This reverts commit 0d9fe4721f174c079a6afcc0456dc939fb7f34eb.