Remove dead code and clean up ecore-x dependency