More services & small clean ups

Not strictly necessary, but if you're touching (or adding) code that contains them, then you can remove it.