Move and remove some stuff