Cleanup of signatures