Removed more old code in Signal