Added check to signature remove