XD-707 finished cleanup