Removed simulate db update flag and split into separate methods