Remove almost redundant update code