Remove last vestiges of old incarnation