clean up signature and import