signature cleanup