Remove self before update as it causes exception by LiveOak