Removing pub-key stuff

I handled that separately