Remove schema service dependency and add oxm

No match.