Small bits of cleanup, handle more possible states (downloaded but not extracted)
Small bits of cleanup, handle more possible states (downloaded but not extracted)

pid1/test-sec-flags,pid1/test-sec-flags