Removed a few of the unused services