Removing 'with' database to update with upstream conventions