Feature duplicate code

SIG duplication fixes.