[master 1/3] Remove duplicate signal setup block