cleanup, reorganization, removing DbmStatus in favor of throwing