Merge "Removed redundant signatures from DatabaseBase"