DEV-20 - partial sign - txRebuild cleanup