FBTest commandLine/api/cd clean up