Cleanup befoire update