Finish refactoring of existing signal code