diff --git a/db/routines/vn/functions/MIDNIGHT.sql b/db/routines/vn/functions/MIDNIGHT.sql
deleted file mode 100644
index d40734fcf..000000000
--- a/db/routines/vn/functions/MIDNIGHT.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`MIDNIGHT`(vDate DATE)
-	RETURNS datetime
-	DETERMINISTIC
-BEGIN
-	RETURN TIMESTAMP(vDate,'23:59:59');
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/functions/routeProposal_.sql b/db/routines/vn/functions/routeProposal_.sql
deleted file mode 100644
index a307d8fc0..000000000
--- a/db/routines/vn/functions/routeProposal_.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`routeProposal_`(vTicketFk INT)
-	RETURNS int(11)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-
-	DECLARE vRouteFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vShipped DATETIME;
-    
-    SELECT addressFk, date(shipped) INTO vAddressFk, vShipped
-		FROM vn.ticket 
-        WHERE id = vTicketFk;
-
-	SELECT routeFk INTO vRouteFk
-		FROM
-			(SELECT t.routeFk, sum(af.friendship) friendshipSum
-				FROM vn.ticket t
-					JOIN cache.addressFriendship af ON af.addressFk2 = t.addressFk AND af.addressFk1 = vAddressFk
-				WHERE t.shipped BETWEEN vShipped and MIDNIGHT(vShipped)
-					AND t.routeFk
-				GROUP BY routeFk
-				ORDER BY friendshipSum DESC
-        ) sub
-        LIMIT 1;
-	
-	RETURN vRouteFk;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/itemShelvingProblem.sql b/db/routines/vn/procedures/itemShelvingProblem.sql
index bb4725434..06c7a376c 100644
--- a/db/routines/vn/procedures/itemShelvingProblem.sql
+++ b/db/routines/vn/procedures/itemShelvingProblem.sql
@@ -38,7 +38,7 @@ BEGIN
 			AND IFNULL(sub3.transit,0) < s.quantity
 			AND s.isPicked = FALSE 
 			AND s.reserved = FALSE
-			AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE()) 
+			AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
 			AND tst.isPreviousPreparable = TRUE
 			AND t.warehouseFk = vWarehouseFk
             AND iss.sectorFk = vSectorFk
diff --git a/db/routines/vn/views/ticketStateToday.sql b/db/routines/vn/views/ticketStateToday.sql
index 0c9e01188..8c11fcc87 100644
--- a/db/routines/vn/views/ticketStateToday.sql
+++ b/db/routines/vn/views/ticketStateToday.sql
@@ -13,4 +13,4 @@ FROM (
 		`vn`.`ticketState` `ts`
 		JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
 	)
-WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())
+WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `util`.`midnight`()