cleanup, add recording opt