Removed MEF dependency
v2.1