Remove leftovers from ESI handling that now happens in req_fsm