Cleanup in command options