diff --git a/XilinxProcessorIPLib/drivers/scaler/data/scaler.tcl b/XilinxProcessorIPLib/drivers/scaler/data/scaler.tcl
index 8486567a..17384609 100755
--- a/XilinxProcessorIPLib/drivers/scaler/data/scaler.tcl
+++ b/XilinxProcessorIPLib/drivers/scaler/data/scaler.tcl
@@ -33,78 +33,11 @@
 # Ver      Who    Date     Changes
 # -------- ------ -------- ------------------------------------
 # 5.0      adk    12/10/13 Updated as per the New Tcl API's
-# 7.0      adk    22/08/14 Modified config_files parameters by adding prefix C_. 
+# 7.0      adk    22/08/14 Modified config_files parameters by adding prefix C_.
 
 proc generate {drv_handle} {
-    xdefine_include_file $drv_handle "xparameters.h" "XSCALER" "NUM_INSTANCES" "DEVICE_ID" "C_BASEADDR" "C_HIGHADDR" "C_NUM_V_TAPS" "C_NUM_H_TAPS" "C_MAX_PHASES" "C_MAX_COEF_SETS" "C_CHROMA_FORMAT" "C_SEPARATE_YC_COEFS" "C_SEPARATE_HV_COEFS"
-    xdefine_config_file $drv_handle "xscaler_g.c" "XScaler" "DEVICE_ID" "C_BASEADDR" "NUM_V_TAPS" "NUM_H_TAPS" "MAX_PHASES" "MAX_COEF_SETS" "C_CHROMA_FORMAT" "C_SEPARATE_YC_COEFS" "C_SEPARATE_HV_COEFS"
-    xdefine_canonical_xpars $drv_handle "xparameters.h" "XScaler" "DEVICE_ID" "C_BASEADDR" "C_HIGHADDR" "C_NUM_V_TAPS" "C_NUM_H_TAPS" "C_MAX_PHASES" "C_MAX_COEF_SETS" "C_CHROMA_FORMAT" "C_SEPARATE_YC_COEFS" "C_SEPARATE_HV_COEFS"
+    ::hsi::utils::define_include_file $drv_handle "xparameters.h" "XSCALER" "NUM_INSTANCES" "DEVICE_ID" "C_BASEADDR" "C_HIGHADDR" "C_NUM_V_TAPS" "C_NUM_H_TAPS" "C_MAX_PHASES" "C_MAX_COEF_SETS" "C_CHROMA_FORMAT" "C_SEPARATE_YC_COEFS" "C_SEPARATE_HV_COEFS"
+    ::hsi::utils::define_config_file $drv_handle "xscaler_g.c" "XScaler" "DEVICE_ID" "C_BASEADDR" "C_NUM_V_TAPS" "C_NUM_H_TAPS" "C_MAX_PHASES" "C_MAX_COEF_SETS" "C_CHROMA_FORMAT" "C_SEPARATE_YC_COEFS" "C_SEPARATE_HV_COEFS"
+    ::hsi::utils::define_canonical_xpars $drv_handle "xparameters.h" "XScaler" "DEVICE_ID" "C_BASEADDR" "C_HIGHADDR" "C_NUM_V_TAPS" "C_NUM_H_TAPS" "C_MAX_PHASES" "C_MAX_COEF_SETS" "C_CHROMA_FORMAT" "C_SEPARATE_YC_COEFS" "C_SEPARATE_HV_COEFS"
 }
 
-
-#
-# Given a list of arguments, define each as a canonical constant name, using
-# the driver name, in an include file.
-#
-proc xdefine_canonical_xpars {drv_handle file_name drv_string args} {
-    # Open include file
-    set file_handle [::hsi::utils::open_include_file $file_name]
-
-    # Get all the peripherals connected to this driver
-    set periphs [::hsi::utils::get_common_driver_ips $drv_handle]
-
-    # Get the names of all the peripherals connected to this driver
-    foreach periph $periphs {
-        set peripheral_name [string toupper [common::get_property NAME $periph]]
-        lappend peripherals $peripheral_name
-    }
-
-    # Get possible canonical names for all the peripherals connected to this driver
-    set device_id 0
-    foreach periph $periphs {
-        set canonical_name [string toupper [format "%s_%s" $drv_string $device_id]]
-        lappend canonicals $canonical_name
-
-        # Create a list of IDs of the peripherals whose hardware instance name
-        # doesn't match the canonical name. These IDs can be used later to
-        # generate canonical definitions
-        if { [lsearch $peripherals $canonical_name] < 0 } {
-            lappend indices $device_id
-        }
-        incr device_id
-    }
-
-    set i 0
-    foreach periph $periphs {
-        set periph_name [string toupper [common::get_property NAME $periph]]
-
-        # Generate canonical definitions only for the peripherals whose
-        # canonical name is not the same as hardware instance name
-        if { [lsearch $canonicals $periph_name] < 0 } {
-            puts $file_handle "/* Canonical definitions for peripheral $periph_name */"
-            set canonical_name [format "%s_%s" $drv_string [lindex $indices $i]]
-
-            foreach arg $args {
-                set lvalue [::hsi::utils::get_driver_param_name $canonical_name $arg]
-
-    # The commented out rvalue is the name of the instance-specific constant
-    #           set rvalue [::hsi::utils::get_ip_param_name $periph $arg]
-
-                # The rvalue set below is the actual value of the parameter
-                set rvalue [common::get_property CONFIG.$arg $periph]
-                if {[llength $rvalue] == 0} {
-                    set rvalue 0
-                }
-                set rvalue [::hsi::utils::format_addr_string $rvalue $arg]
-
-                puts $file_handle "#define $lvalue $rvalue"
-
-            }
-            puts $file_handle ""
-            incr i
-        }
-    }
-
-    puts $file_handle "\n/******************************************************************/\n"
-    close $file_handle
-}