Revert "Updates to router and client"

Reverts kbase/assembly#122