diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index 5874e59..7886e23 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -35,10 +35,6 @@
 		# Power measurement
 		self.pm = pm
 
-	def shutdown(self):
-		print("[i] Shutdown CTRL interface")
-		ctrl_if.shutdown(self)
-
 	def parse_cmd(self, request):
 		# Power control
 		if self.verify_cmd(request, "POWERON", 0):
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index 675ef5c..cedcb1b 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -35,6 +35,9 @@
 		self.remote_addr = remote_addr
 		self.remote_port = remote_port
 
+	def __del__(self):
+		self.sock.close()
+
 	def loop(self):
 		r_event, w_event, x_event = select.select([self.sock], [], [])
 
@@ -43,9 +46,6 @@
 			data, addr = self.sock.recvfrom(128)
 			self.handle_rx(data.decode())
 
-	def shutdown(self):
-		self.sock.close();
-
 	def send(self, data):
 		if type(data) not in [bytearray, bytes]:
 			data = data.encode()