cleanup signatures - first pass