Merge "Remove long-since unused cruft methods from DatabaseBase"