Index: main/pbx.c
===================================================================
--- main/pbx.c	(revision 375831)
+++ main/pbx.c	(working copy)
@@ -10472,12 +10472,17 @@
 	if (device_state_sub) {
 		device_state_sub = ast_event_unsubscribe(device_state_sub);
 	}
+	if (device_state_tps) {
+		ast_taskprocessor_unreference(device_state_tps);
+		device_state_tps = NULL;
+	}
 
 	/* Unregister builtin applications */
 	for (x = 0; x < ARRAY_LEN(builtins); x++) {
 		ast_unregister_application(builtins[x].name);
 	}
 	ast_manager_unregister("ShowDialPlan");
+	ast_cli_unregister_multiple(pbx_cli, ARRAY_LEN(pbx_cli));
 	ast_custom_function_unregister(&exception_function);
 	ast_custom_function_unregister(&testtime_function);
 	ast_data_unregister(NULL);