Removed more db prefixes