Simplify the services system until we need the added complexity