* tidy: clean up some leftovers Fixes #56 Fixes #57 Fixes #58 * api: remove standalone merge function Fixes #55