sml: replace static factories with json hydrator
patches: remove stale patches