consolidate rsync stuff