Remove signature dependency