Revert "dbapi #step5"

This reverts commit 6baaa8480e53e1d09483c108ce201cc5086cf95e.
Revert "bdapi step6"

This reverts commit fd5fd0e76570a6ce2efa1d8126c1c84c0f7807aa.