user update and cleanup