Mediator cleanup

Test: npm run build:all && npm run test:all
Change-Id: Iaf2486682146310a0c888e9c67ad34751068f3be
1 file changed