diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index c907d66d5a..dd92ff1b28 100644
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -310,13 +310,10 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
 static int ssmpingd_sock_read(struct thread *t)
 {
   struct ssmpingd_sock *ss;
-  int sock_fd;
   int result;
 
   ss = THREAD_ARG(t);
 
-  sock_fd = THREAD_FD(t);
-
   result = ssmpingd_read_msg(ss);
 
   /* Keep reading */
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 49c0ad3fd9..d06703ccb3 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -1377,8 +1377,7 @@ pim_upstream_start_register_stop_timer (struct pim_upstream *up, int null_regist
 {
   uint32_t time;
 
-  if (up->t_rs_timer)
-    THREAD_TIMER_OFF (up->t_rs_timer);
+  THREAD_TIMER_OFF (up->t_rs_timer);
 
   if (!null_register)
     {