cleanups for 2.10
upgrade gpg plugin