Remove services that only function within EBI