Fix services so that we only setup the ones we actually care about