remnants of signals upgrade