remove model injection out of mediator and into commands