diff --git a/.golangci.yml b/.golangci.yml
index 2d6ef883..e294422b 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -23,7 +23,6 @@ linters:
     - goimports
     - goprintffuncname
     - gosec
-    - ifshort
     - misspell
     - prealloc
     - revive
diff --git a/bubbletea/tea_unix.go b/bubbletea/tea_unix.go
index dc967c4f..212402a9 100644
--- a/bubbletea/tea_unix.go
+++ b/bubbletea/tea_unix.go
@@ -60,7 +60,7 @@ func newRenderer(s ssh.Session) *lipgloss.Renderer {
 	return r
 }
 
-// copied from x/exp/term
+// copied from x/exp/term.
 func queryBackgroundColor(s ssh.Session) (bg color.Color) {
 	_ = term.QueryTerminal(s, s, func(events []input.Event) bool {
 		for _, e := range events {
diff --git a/options.go b/options.go
index 0810f8bc..e404b139 100644
--- a/options.go
+++ b/options.go
@@ -55,7 +55,7 @@ func WithBannerHandler(h ssh.BannerHandler) ssh.Option {
 // Notice that middlewares are composed from first to last, which means the last one is executed first.
 func WithMiddleware(mw ...Middleware) ssh.Option {
 	return func(s *ssh.Server) error {
-		h := func(s ssh.Session) {}
+		h := func(ssh.Session) {}
 		for _, m := range mw {
 			h = m(h)
 		}
diff --git a/scp/copy_from_client.go b/scp/copy_from_client.go
index d2d01bbd..17caecaf 100644
--- a/scp/copy_from_client.go
+++ b/scp/copy_from_client.go
@@ -100,7 +100,7 @@ func copyFromClient(s ssh.Session, info Info, handler CopyFromClientHandler) err
 			}
 
 			// read the trailing nil char
-			_, _ = r.ReadByte() // TODO: check if it is indeed a NULL?
+			_, _ = r.ReadByte()
 
 			mtime = 0
 			atime = 0