Removed commented code. Signature is no longer handled here