More services & small clean ups

Hehe, Ctrl-V reviewing. :)

Since you're touching the code anyway, take the opportunity to remove it.