Remove unnecessary timeouts from service