Remove the service calls that don't seem necessary and just break things because they try to run before the service exists