removing old datalogging
merging