Remove leftovers, add defer to socket closure