diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c
index e2d3160..1e40dcb 100644
--- a/openbsc/src/gprs/gprs_llc.c
+++ b/openbsc/src/gprs/gprs_llc.c
@@ -308,6 +308,8 @@
 	return fcs_calc;
 }
 
+#if 0
+/* FIXME: Unused code... */
 static void t200_expired(void *data)
 {
 	struct gprs_llc_lle *lle = data;
@@ -330,6 +332,9 @@
 		/* FIXME: re-start T200 */
 		lle->retrans_ctr++;
 		break;
+	default:
+		LOGP(DLLC, LOGL_ERROR, "LLC unhandled state: %d\n", lle->state);
+		break;
 	}
 
 }
@@ -344,6 +349,7 @@
 		lle->retrans_ctr++;
 	}
 }
+#endif
 
 int gprs_llc_tx_u(struct msgb *msg, uint8_t sapi, int command,
 		  enum gprs_llc_u_cmd u_cmd, int pf_bit)
@@ -620,6 +626,9 @@
 		if ((gph->seq_tx + 1) / 512)
 			lle->oc_ui_recv += 512;
 		break;
+	default:
+		LOGP(DLLC, LOGL_NOTICE, "Unhandled command: %d\n", gph->cmd);
+		break;
 	}
 
 	return 0;
@@ -788,7 +797,6 @@
 /* receive an incoming LLC PDU (BSSGP-UL-UNITDATA-IND, 7.2.4.2) */
 int gprs_llc_rcvmsg(struct msgb *msg, struct tlv_parsed *tv)
 {
-	struct bssgp_ud_hdr *udh = (struct bssgp_ud_hdr *) msgb_bssgph(msg);
 	struct gprs_llc_hdr *lh = (struct gprs_llc_hdr *) msgb_llch(msg);
 	struct gprs_llc_hdr_parsed llhp;
 	struct gprs_llc_lle *lle;