EncoreMpdel move to UI
Uneccassry dependancies removed