Removes leftover rescue
Revert "Renames connections in deliver service"

This reverts commit af7e9ad35058bab0823ee12b00aafe7bd46e7523.