Cleanup signallers too