Prepare for move to server