make signature removal regexps more explicit