Removed expensive gpg calls