spec singleton cleanup