removing mediator
working on app base