remove DB::single instances and comments, no functional change