Refactor code so that Signature doesn't need a name. Remove unused classes.