keep only signalstats and remove diff with upstream master