Panorama cleanup