Click Detector cleanup