diff --git a/openpgp/packet/aead_crypter.go b/openpgp/packet/aead_crypter.go
index 2d1aeed6..7171387f 100644
--- a/openpgp/packet/aead_crypter.go
+++ b/openpgp/packet/aead_crypter.go
@@ -173,10 +173,7 @@ func (ar *aeadDecrypter) validateFinalTag(tag []byte) error {
 	adata = append(adata, amountBytes...)
 	nonce := ar.computeNextNonce()
 	_, err := ar.aead.Open(nil, nonce, tag, adata)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // aeadEncrypter encrypts and writes bytes. It encrypts when necessary according
diff --git a/openpgp/packet/compressed.go b/openpgp/packet/compressed.go
index 334de286..0bcb38ca 100644
--- a/openpgp/packet/compressed.go
+++ b/openpgp/packet/compressed.go
@@ -9,7 +9,6 @@ import (
 	"compress/flate"
 	"compress/zlib"
 	"io"
-	"io/ioutil"
 	"strconv"
 
 	"github.com/ProtonMail/go-crypto/openpgp/errors"
@@ -91,7 +90,7 @@ func (c *Compressed) parse(r io.Reader) error {
 		}
 		c.Body = newDecompressionReader(r, decompressor)
 	case 3:
-		c.Body = newDecompressionReader(r, ioutil.NopCloser(bzip2.NewReader(r)))
+		c.Body = newDecompressionReader(r, io.NopCloser(bzip2.NewReader(r)))
 	default:
 		err = errors.UnsupportedError("unknown compression algorithm: " + strconv.Itoa(int(buf[0])))
 	}
diff --git a/openpgp/packet/padding.go b/openpgp/packet/padding.go
index 06fa8374..3b6a7045 100644
--- a/openpgp/packet/padding.go
+++ b/openpgp/packet/padding.go
@@ -2,7 +2,6 @@ package packet
 
 import (
 	"io"
-	"io/ioutil"
 )
 
 // Padding type represents a Padding Packet (Tag 21).
@@ -12,7 +11,7 @@ type Padding int
 
 // parse just ignores the padding content.
 func (pad Padding) parse(reader io.Reader) error {
-	_, err := io.CopyN(ioutil.Discard, reader, int64(pad))
+	_, err := io.CopyN(io.Discard, reader, int64(pad))
 	return err
 }
 
diff --git a/openpgp/packet/public_key.go b/openpgp/packet/public_key.go
index b1dbe269..a5d1bdb6 100644
--- a/openpgp/packet/public_key.go
+++ b/openpgp/packet/public_key.go
@@ -590,10 +590,7 @@ func (pk *PublicKey) SerializeSignaturePrefix(w io.Writer) error {
 			byte(pLength >> 8),
 			byte(pLength),
 		})
-		if err != nil {
-			return err
-		}
-		return nil
+		return err
 	}
 	if _, err := w.Write([]byte{0x99, byte(pLength >> 8), byte(pLength)}); err != nil {
 		return err
diff --git a/openpgp/packet/symmetrically_encrypted_mdc.go b/openpgp/packet/symmetrically_encrypted_mdc.go
index 645963fa..0a3aecad 100644
--- a/openpgp/packet/symmetrically_encrypted_mdc.go
+++ b/openpgp/packet/symmetrically_encrypted_mdc.go
@@ -241,9 +241,6 @@ func serializeSymmetricallyEncryptedMdc(ciphertext io.WriteCloser, c CipherFunct
 	if err != nil {
 		return nil, err
 	}
-	if err != nil {
-		return
-	}
 	s, prefix := NewOCFBEncrypter(block, iv, OCFBNoResync)
 	_, err = ciphertext.Write(prefix)
 	if err != nil {