cleaning up and consolidating mover_PC versions