Merge "service: remove re-implemented functions"