Remove dependency on MEF