refactor ebiServiceAnnotator + remove accidental commit - breaks build