Super-cleanup with new headers