Remove mediator module. Not used as much as before anymore.
Style fixes.