cleanup towards data transfer