Expand PKCS7 removal and use flags for arg parsing