diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 56aeac72093..970e7be9e13 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2385,7 +2385,7 @@ static void
 dealloc_ofp_port(struct ofproto *ofproto, ofp_port_t ofp_port)
 {
     if (ofp_to_u16(ofp_port) < ofproto->max_ports) {
-        ofport_set_usage(ofproto, ofp_port, time_msec());
+        ofport_remove_usage(ofproto, ofp_port);
     }
 }
 
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index cb7c5cb769d..77667f2eda5 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <stdlib.h>
+#include <malloc.h>
 
 #include "async-append.h"
 #include "bfd.h"
@@ -3255,6 +3256,7 @@ bridge_run__(void)
 void
 bridge_run(void)
 {
+    malloc_trim(0);
     static struct ovsrec_open_vswitch null_cfg;
     const struct ovsrec_open_vswitch *cfg;