Cleanup for 4703

This fixes #4721 by doing the cleanup requested in 4703. Notably:

* removes `signatureMap`
* adds test for existence of weight and signature when merging nodes. Fixed bug with weight.
* additional comment for a test