Remove ABC
Put usages into its own service