Remove unneccesary changes from patch
Fix verify message structure to conform more to spec