diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index 2fce011..6071dbf 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -106,24 +106,6 @@
 			};
 		};
 	};
-
-	bootstate: bootstate {
-		compatible = "barebox,bootstate";
-		backend-type = "state"; // or "nv", or "efivar"
-		backend = <&state>;
-
-		system0 {
-			default_attempts = <3>;
-		};
-
-		system1 {
-			default_attempts = <3>;
-		};
-
-		factory {
-			default_attempts = <3>;
-		};
-	};
 };
 
 &{/soc/clkmgr@ffd04000/clocks/osc1} {
diff --git a/common/ratp/ratp.c b/common/ratp/ratp.c
index b8043fe..9ca299e 100644
--- a/common/ratp/ratp.c
+++ b/common/ratp/ratp.c
@@ -15,11 +15,9 @@
 
 #include <common.h>
 #include <command.h>
-#include <kfifo.h>
 #include <malloc.h>
 #include <init.h>
 #include <ratp.h>
-#include <command.h>
 #include <byteorder.h>
 #include <environment.h>
 #include <kfifo.h>
@@ -27,6 +25,7 @@
 #include <linux/sizes.h>
 #include <ratp_bb.h>
 #include <fs.h>
+#include <console_countdown.h>
 
 LIST_HEAD(ratp_command_list);
 EXPORT_SYMBOL(ratp_command_list);
@@ -473,6 +472,8 @@
 
 	ctx->poller_registered = true;
 
+	console_countdown_abort();
+
 	console_set_active(&ctx->ratp_console, CONSOLE_STDOUT | CONSOLE_STDERR |
 			CONSOLE_STDIN);
 
diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
index 6dfcea2..b13b7e0 100644
--- a/drivers/crypto/caam/intern.h
+++ b/drivers/crypto/caam/intern.h
@@ -53,8 +53,6 @@
  */
 struct caam_drv_private {
 
-	struct device *dev;
-	struct device *smdev;
 	struct device_d **jrpdev; /* Alloc'ed array per sub-device */
 	struct device_d *pdev;
 
@@ -89,9 +87,6 @@
 	struct clk *caam_emi_slow;
 };
 
-void caam_jr_algapi_init(struct device *dev);
-void caam_jr_algapi_remove(struct device *dev);
-
 int caam_rng_probe(struct device_d *dev, struct device_d *jrdev);
 int caam_blob_gen_probe(struct device_d *dev, struct device_d *jrdev);
 int caam_jr_probe(struct device_d *dev);
diff --git a/drivers/crypto/caam/jr.h b/drivers/crypto/caam/jr.h
index e0e53c0..85aca6d 100644
--- a/drivers/crypto/caam/jr.h
+++ b/drivers/crypto/caam/jr.h
@@ -8,8 +8,6 @@
 #define JR_H
 
 /* Prototypes for backend-level services exposed to APIs */
-struct device *caam_jr_alloc(void);
-void caam_jr_free(struct device *rdev);
 int caam_jr_enqueue(struct device_d *dev, u32 *desc,
 		    void (*cbk)(struct device_d *dev, u32 *desc, u32 status,
 				void *areq),
diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index 7653518..cf166f3 100644
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -45,7 +45,6 @@
 };
 
 struct sx150x_gpio {
-	struct device *dev;
 	struct i2c_client *client;
 	struct gpio_chip gpio;
 	struct regmap *regmap;
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 445cc32..95f5b90 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -179,8 +179,10 @@
 
 	strings_dev[USB_GADGET_MANUFACTURER_IDX].s = gadget->manufacturer;
 	strings_dev[USB_GADGET_PRODUCT_IDX].s = gadget->productname;
+	strings_dev[USB_GADGET_SERIAL_IDX].s = gadget->serialnumber;
 
 	device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;
+	device_desc.iSerialNumber = strings_dev[USB_GADGET_SERIAL_IDX].id;
 
 	config.label          = strings_dev[STRING_DESCRIPTION_IDX].s;
 	config.iConfiguration = strings_dev[STRING_DESCRIPTION_IDX].id;
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index 126d76e..2516676 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -212,6 +212,9 @@
 	gadget->productname = xstrdup(barebox_get_model());
 	dev_add_param_string(&gadget->dev, "productname", NULL, NULL,
 			&gadget->productname, NULL);
+	gadget->serialnumber = xstrdup("");
+	dev_add_param_string(&gadget->dev, "serialnumber", NULL, NULL,
+			&gadget->serialnumber, NULL);
 
 	dev_set_name(&udc->dev, "udc");
 	udc->dev.id = DEVICE_ID_DYNAMIC;
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index fc5cfb1..87f7e78 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -653,15 +653,6 @@
 	kfree(to_musb_request(req));
 }
 
-static LIST_HEAD(buffers);
-
-struct free_record {
-	struct list_head	list;
-	struct device		*dev;
-	unsigned		bytes;
-	dma_addr_t		dma;
-};
-
 /*
  * Context: controller locked, IRQs blocked.
  */
diff --git a/include/usb/gadget.h b/include/usb/gadget.h
index afa11b2..3e1d715 100644
--- a/include/usb/gadget.h
+++ b/include/usb/gadget.h
@@ -561,6 +561,7 @@
 	uint32_t			product_id;
 	char				*manufacturer;
 	char				*productname;
+	char				*serialnumber;
 };
 #define work_to_gadget(w)	(container_of((w), struct usb_gadget, work))