Refactor mediator

Eliminated unuseful imports

Signed-off-by: Mihaela Martinas <martinas.mihaela21@gmail.com>