Switch to custom signals, remove blinker