Remove SignalManager (a lot of boilerplate code only used for state switches)