amend WAMP implementations, cleanup