[TASK] Service cleanup: CGL, shifts to API, mini performance boosts