WINDUP-121: Remove interface/implementation split from Service classes

Yes.... will fix.