Properly remove signature stuff