Remove packages
stop packages being committed
put in new clients, move some stuff around