Add comment
Remove dead code
Move more code to super-class
First pass for a passthrough service