Removed old code, simplified pgp options in data bag