Signature cleanup