Revert "Database Management Update"

This reverts commit 5ff81e92f052298c6f40564ad6bb54ea1f44fa7a.