Clean up, move of diagnostic interface, and refuel position to return Zone