Update cleanup to save stuff