diff --git a/misc/install_nvidia_driver.sh b/misc/install_nvidia_driver.sh
index b276059d9..bd2b3fab2 100755
--- a/misc/install_nvidia_driver.sh
+++ b/misc/install_nvidia_driver.sh
@@ -53,7 +53,7 @@ fail_exit()
 }
 
 ##########################################################################################
-# Drivers for Ubuntu 18.04 / 20.04
+# Drivers for Ubuntu 18.04 / 20.04 / 22.04
 ##########################################################################################
 install_base_ubuntu()
 {
diff --git a/misc/stubs/Makefile b/misc/stubs/Makefile
index 71333768f..3163815f3 100644
--- a/misc/stubs/Makefile
+++ b/misc/stubs/Makefile
@@ -8,14 +8,13 @@ CFLAGS = -Wall -fPIC
 LDFLAGS = -shared
 
 # Source files
-SOURCES = libnvidia-ml_stub.c libcuda_stub.c libxma2api_stub.c libxrm_stub.c libxrt_core_stub.c libnppig_stub.c libnppicc_stub.c
+SOURCES = libnvidia-ml_stub.c libcuda_stub.c libxma2api_stub.c libxrm_stub.c libxrt_core_stub.c 
 
 # Object files
 OBJECTS = $(SOURCES:.c=.o)
 
 # Output libraries
-TARGETS = libnvidia-ml.so.1 libcuda.so.1 libxma2api.so.2 \
-		  libxrm.so.1 libxrt_core.so.2 libnppig.so.10 libnppig.so.11 libnppig.so.12 libnppicc.so.10 libnppicc.so.11 libnppicc.so.12 
+TARGETS = libnvidia-ml.so.1 libcuda.so.1 libxma2api.so.2 libxrm.so.1 libxrt_core.so.2 
 
 # Install path prefix (default: /opt/ovenmediaengine)
 PREFIX ?= /opt/ovenmediaengine
@@ -33,24 +32,6 @@ libnvidia-ml.so.1: libnvidia-ml_stub.o
 libcuda.so.1: libcuda_stub.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
-libnppig.so.10: libnppig_stub.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-libnppig.so.11: libnppig_stub.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-libnppig.so.12: libnppig_stub.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-libnppicc.so.10: libnppicc_stub.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-libnppicc.so.11: libnppicc_stub.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-libnppicc.so.12: libnppicc_stub.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
 ###############################################
 # Stubs library for xilinx driver
 ###############################################
diff --git a/misc/stubs/libnppicc_stub.c b/misc/stubs/libnppicc_stub.c
deleted file mode 100644
index ec1745e4c..000000000
--- a/misc/stubs/libnppicc_stub.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <stdio.h>
-
-typedef enum
-{
-    NPP_ERROR                               = -2,
-    NPP_ERROR_RESERVED                      = -1,
-    NPP_NO_ERROR                            = 0, 
-    NPP_SUCCESS = NPP_NO_ERROR   
-} NppStatus;
-
-typedef unsigned char       Npp8u;     /**<  8-bit unsigned chars */
-typedef signed char         Npp8s;     /**<  8-bit signed chars */
-typedef unsigned short      Npp16u;    /**<  16-bit unsigned integers */
-typedef short               Npp16s;    /**<  16-bit signed integers */
-typedef unsigned int        Npp32u;    /**<  32-bit unsigned integers */
-typedef int                 Npp32s;    /**<  32-bit signed integers */
-typedef unsigned long long  Npp64u;    /**<  64-bit unsigned integers */
-typedef long long           Npp64s;    /**<  64-bit signed integers */
-typedef float               Npp32f;    /**<  32-bit (IEEE) floating-point numbers */
-typedef double              Npp64f;    /**<  64-bit floating-point numbers */
-
-/**
- * 2D Size
- * This struct typically represents the size of a a rectangular region in
- * two space.
- */
-typedef struct
-{
-    int width;  /**<  Rectangle width. */
-    int height; /**<  Rectangle height. */
-} NppiSize;
-
-NppStatus nppiYCbCr420_8u_P2P3R(const Npp8u * const pSrcY, int nSrcYStep, const Npp8u * pSrcCbCr, int nSrcCbCrStep, Npp8u * pDst[3], int rDstStep[3], NppiSize oSizeROI)
-{
-    return NPP_ERROR;
-}
-
-NppStatus nppiYCbCr420_8u_P3P2R(const Npp8u * const pSrc[3], int rSrcStep[3], Npp8u * pDstY, int nDstYStep, Npp8u * pDstCbCr, int nDstCbCrStep, NppiSize oSizeROI)
-{
-    return NPP_ERROR;
-}
diff --git a/misc/stubs/libnppig_stub.c b/misc/stubs/libnppig_stub.c
deleted file mode 100644
index 5d492a4ad..000000000
--- a/misc/stubs/libnppig_stub.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-
-typedef enum {
-	NPP_ERROR = -2,
-	NPP_ERROR_RESERVED = -1,
-	NPP_NO_ERROR = 0,
-	NPP_SUCCESS = NPP_NO_ERROR
-} NppStatus;
-
-typedef unsigned char Npp8u;	   /**<  8-bit unsigned chars */
-typedef signed char Npp8s;		   /**<  8-bit signed chars */
-typedef unsigned short Npp16u;	   /**<  16-bit unsigned integers */
-typedef short Npp16s;			   /**<  16-bit signed integers */
-typedef unsigned int Npp32u;	   /**<  32-bit unsigned integers */
-typedef int Npp32s;				   /**<  32-bit signed integers */
-typedef unsigned long long Npp64u; /**<  64-bit unsigned integers */
-typedef long long Npp64s;		   /**<  64-bit signed integers */
-typedef float Npp32f;			   /**<  32-bit (IEEE) floating-point numbers */
-typedef double Npp64f;			   /**<  64-bit floating-point numbers */
-
-/**
- * 2D Size
- * This struct typically represents the size of a a rectangular region in
- * two space.
- */
-typedef struct {
-	int width;	/**<  Rectangle width. */
-	int height; /**<  Rectangle height. */
-} NppiSize;
-
-/**
- * 2D Rectangle
- * This struct contains position and size information of a rectangle in
- * two space.
- * The rectangle's position is usually signified by the coordinate of its
- * upper-left corner.
- */
-typedef struct {
-	int x; /**<  x-coordinate of upper left corner (lowest memory address). */
-	int y; /**<  y-coordinate of upper left corner (lowest memory address). */
-	int width;	/**<  Rectangle width. */
-	int height; /**<  Rectangle height. */
-} NppiRect;
-
-NppStatus nppiResizeSqrPixel_8u_C1R(const Npp8u* pSrc, NppiSize oSrcSize,
-									int nSrcStep, NppiRect oSrcROI, Npp8u* pDst,
-									int nDstStep, NppiRect oDstROI,
-									double nXFactor, double nYFactor,
-									double nXShift, double nYShift,
-									int eInterpolation) 
-{
-	return NPP_ERROR;
-}