master repo clean up

depends on #445 and forward-ports #453