[NO MERGE!] Remove signature computation