Signature notes cleanups