added cleanup to command options