Code cleanup.
Merge branch 'signing'