Move cleanup to update/install cmd