Minor cleanup to remove wrong bdb references