Cleanup signals, implement improved cascade