diff --git a/Makefile b/Makefile
index b1f76ee..2bb460d 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@
 .PHONY: protos
 protos:
 	make -C $(OPENOLT_PROTOS_DIR) all
-clean-protos:
+protos-clean:
 	-make -C $(OPENOLT_PROTOS_DIR) clean
 
 ########################################################################
@@ -233,10 +233,22 @@
 src/%.o: %.cpp
 	$(CXX) -MMD -c $< -o $@
 
-clean: clean-protos
+deb-clean:
+	rm -f $(BUILD_DIR)/*.deb
+	rm -f mkdebian/debian/asfvolt16.debhelper.log
+	rm -f mkdebian/debian/asfvolt16.postinst.debhelper
+	rm -f mkdebian/debian/asfvolt16.postrm.debhelper
+	rm -rf mkdebian/debian/asfvolt16/
+	rm -f mkdebian/debian/libgrpc++.so.1
+	rm -f mkdebian/debian/libgrpc++_reflection.so.1
+	rm -f mkdebian/debian/libgrpc.so.6
+	rm -f mkdebian/debian/openolt
+	rm -f mkdebian/debian/release_asfvolt16.tar.gz
+	rm -rf mkdebian/debian/tmp/
+
+clean: protos-clean
 	rm -f $(OBJS) $(DEPS)
 	rm -f $(BUILD_DIR)/libgrpc.so.6 $(BUILD_DIR)/libgrpc++.so.1 $(BUILD_DIR)/libgrpc++_reflection.so.1
-	rm -f $(BUILD_DIR)/*.deb
 
 distclean:
 	rm -rf $(BUILD_DIR)
diff --git a/mkdebian/debian/asfvolt16.substvars b/mkdebian/debian/asfvolt16.substvars
deleted file mode 100644
index abd3ebe..0000000
--- a/mkdebian/debian/asfvolt16.substvars
+++ /dev/null
@@ -1 +0,0 @@
-misc:Depends=