diff --git a/lib/filter.c b/lib/filter.c
index 5f391aa76704..670c65374a0f 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -549,8 +549,7 @@ static int vty_access_list_remark_unset(struct vty *vty, afi_t afi,
 		access->remark = NULL;
 	}
 
-	if (access->head == NULL && access->tail == NULL
-	    && access->remark == NULL)
+	if (access->head == NULL && access->tail == NULL)
 		access_list_delete(access);
 
 	return CMD_SUCCESS;
diff --git a/lib/module.c b/lib/module.c
index 0c853640035a..7d5671290bc7 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -85,7 +85,7 @@ struct frrmod_runtime *frrmod_load(const char *spec, const char *dir, char *err,
 		*args++ = '\0';
 
 	if (!strchr(name, '/')) {
-		if (!handle && execname) {
+		if (execname) {
 			snprintf(fullpath, sizeof(fullpath), "%s/%s_%s.so", dir,
 				 execname, name);
 			handle = dlopen(fullpath, RTLD_NOW | RTLD_GLOBAL);
diff --git a/lib/vrf.c b/lib/vrf.c
index 643ad29cf865..ca50c1e70e85 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -628,7 +628,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
 	}
 	if (vrf->ns_ctxt != NULL) {
 		ns = (struct ns *)vrf->ns_ctxt;
-		if (ns && 0 != strcmp(ns->name, pathname)) {
+		if (!strcmp(ns->name, pathname)) {
 			if (vty)
 				vty_out(vty,
 					"VRF %u already configured with NETNS %s\n",
@@ -661,8 +661,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
 	ns->vrf_ctxt = (void *)vrf;
 	vrf->ns_ctxt = (void *)ns;
 	/* update VRF netns NAME */
-	if (vrf)
-		strlcpy(vrf->data.l.netns_name, basename(pathname), NS_NAMSIZ);
+	strlcpy(vrf->data.l.netns_name, basename(pathname), NS_NAMSIZ);
 
 	if (!ns_enable(ns, vrf_update_vrf_id)) {
 		if (vty)
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index e82a7589b719..eb3307589ec0 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -136,9 +136,8 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch)
 			mask = PIM_OIF_FLAG_PROTO_IGMP;
 
 		/* SGRpt entry could have empty oil */
-		if (ch->upstream->channel_oil)
-			pim_channel_del_oif(ch->upstream->channel_oil,
-					    ch->interface, mask);
+		pim_channel_del_oif(ch->upstream->channel_oil, ch->interface,
+				    mask);
 		/*
 		 * Do we have any S,G's that are inheriting?
 		 * Nuke from on high too.
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 42bdd80ce226..b46f1b5e9dde 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -909,10 +909,9 @@ static int pim_igmp_read(struct thread *t)
 	socklen_t fromlen = sizeof(from);
 	socklen_t tolen = sizeof(to);
 	ifindex_t ifindex = -1;
-	int cont = 1;
 	int len;
 
-	while (cont) {
+	while (1) {
 		len = pim_socket_recvfromto(igmp->fd, buf, sizeof(buf), &from,
 					    &fromlen, &to, &tolen, &ifindex);
 		if (len < 0) {
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 5c8421941842..8f6e31cfa886 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -986,7 +986,7 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 	if (tb[IFA_LABEL])
 		label = (char *)RTA_DATA(tb[IFA_LABEL]);
 
-	if (ifp && label && strcmp(ifp->name, label) == 0)
+	if (label && strcmp(ifp->name, label) == 0)
 		label = NULL;
 
 	/* Register interface address to the interface. */
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index 8c23bf34cf16..5975c4058b99 100644
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -615,7 +615,7 @@ static int zebra_ptm_handle_msg_cb(void *arg, void *in_ctxt)
 
 int zebra_ptm_sock_read(struct thread *thread)
 {
-	int sock, done = 0;
+	int sock;
 	int rc;
 
 	errno = 0;
@@ -625,28 +625,24 @@ int zebra_ptm_sock_read(struct thread *thread)
 		return -1;
 
 	/* PTM communicates in CSV format */
-	while (!done) {
+	do {
 		rc = ptm_lib_process_msg(ptm_hdl, sock, ptm_cb.in_data,
 					 ZEBRA_PTM_MAX_SOCKBUF, NULL);
-		if (rc <= 0)
-			break;
-	}
+	} while (rc > 0);
 
-	if (rc <= 0) {
-		if (((rc == 0) && !errno)
-		    || (errno && (errno != EWOULDBLOCK) && (errno != EAGAIN))) {
-			zlog_warn("%s routing socket error: %s(%d) bytes %d",
-				  __func__, safe_strerror(errno), errno, rc);
-
-			close(ptm_cb.ptm_sock);
-			ptm_cb.ptm_sock = -1;
-			zebra_ptm_reset_status(0);
-			ptm_cb.t_timer = NULL;
-			thread_add_timer(zebrad.master, zebra_ptm_connect, NULL,
-					 ptm_cb.reconnect_time,
-					 &ptm_cb.t_timer);
-			return (-1);
-		}
+	if (((rc == 0) && !errno)
+	    || (errno && (errno != EWOULDBLOCK) && (errno != EAGAIN))) {
+		zlog_warn("%s routing socket error: %s(%d) bytes %d",
+			  __func__, safe_strerror(errno), errno, rc);
+
+		close(ptm_cb.ptm_sock);
+		ptm_cb.ptm_sock = -1;
+		zebra_ptm_reset_status(0);
+		ptm_cb.t_timer = NULL;
+		thread_add_timer(zebrad.master, zebra_ptm_connect, NULL,
+				 ptm_cb.reconnect_time,
+				 &ptm_cb.t_timer);
+		return (-1);
 	}
 
 	ptm_cb.t_read = NULL;