Signature versions 2 and 4 both working; commencing cleanup