Remove use of filters/pipe
Cleanup PBES2 and add GCM support