Clean up and orientation change