clean up and no dyn_rec for source and data