Split CodeService
Split & Remove CodeService