diff --git a/projects/adrv9371x/a10soc/Makefile b/projects/adrv9371x/a10soc/Makefile
index 29443506c..74abe24c5 100644
--- a/projects/adrv9371x/a10soc/Makefile
+++ b/projects/adrv9371x/a10soc/Makefile
@@ -21,16 +21,6 @@ M_DEPS += ../../common/a10soc/a10soc_system_qsys.tcl
 M_DEPS += ../../common/a10soc/a10soc_system_assign.tcl
 M_DEPS += ../../../library/altera/common/ad_dcfilter.v
 M_DEPS += ../../../library/altera/common/ad_mul.v
-M_DEPS += ../../../library/altera_arria10_hps/altera_arria10_hps_hw.tcl
-M_DEPS += ../../../library/altera_avalon_pio/altera_avalon_pio_hw.tcl
-M_DEPS += ../../../library/altera_avalon_spi/altera_avalon_spi_hw.tcl
-M_DEPS += ../../../library/altera_clock_bridge/altera_clock_bridge_hw.tcl
-M_DEPS += ../../../library/altera_emif_a10_hps/altera_emif_a10_hps_hw.tcl
-M_DEPS += ../../../library/altera_iopll/altera_iopll_hw.tcl
-M_DEPS += ../../../library/altera_jesd204/altera_jesd204_hw.tcl
-M_DEPS += ../../../library/altera_pll_reconfig/altera_pll_reconfig_hw.tcl
-M_DEPS += ../../../library/altera_xcvr_atx_pll_a10/altera_xcvr_atx_pll_a10_hw.tcl
-M_DEPS += ../../../library/altera_xcvr_reset_control/altera_xcvr_reset_control_hw.tcl
 M_DEPS += ../../../library/axi_ad9371/axi_ad9371.v
 M_DEPS += ../../../library/axi_ad9371/axi_ad9371_hw.tcl
 M_DEPS += ../../../library/axi_ad9371/axi_ad9371_if.v
diff --git a/projects/adrv9371x/a10soc/system_qsys.tcl b/projects/adrv9371x/a10soc/system_qsys.tcl
index b34fcb1a6..2b861df8a 100644
--- a/projects/adrv9371x/a10soc/system_qsys.tcl
+++ b/projects/adrv9371x/a10soc/system_qsys.tcl
@@ -1,6 +1,5 @@
 
 
-source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/common/a10soc/a10soc_system_qsys.tcl
 source ../common/adrv9371x_qsys.tcl
 
diff --git a/projects/common/a10soc/a10soc_system_assign.tcl b/projects/common/a10soc/a10soc_system_assign.tcl
index f39acc047..8ad011f59 100755
--- a/projects/common/a10soc/a10soc_system_assign.tcl
+++ b/projects/common/a10soc/a10soc_system_assign.tcl
@@ -264,27 +264,6 @@ set_global_assignment -name TIMEQUEST_DO_CCPP_REMOVAL ON
 set_global_assignment -name TIMEQUEST_REPORT_SCRIPT $ad_hdl_dir/projects/scripts/adi_tquest.tcl
 set_global_assignment -name ON_CHIP_BITSTREAM_DECOMPRESSION OFF
 
-# set libraries
+# source defaults
 
-set ad_lib_folders "$ad_hdl_dir/library/**/*;$ad_phdl_dir/library/**/*"
-
-set_user_option -name USER_IP_SEARCH_PATHS $ad_lib_folders
-set_global_assignment -name IP_SEARCH_PATHS $ad_lib_folders
-
-# generate qsys
-# move this to a project script
-
-set mmu_enabled 1
-if [info exists ::env(ALT_NIOS_MMU_ENABLED)] {
-  set mmu_enabled $::env(ALT_NIOS_MMU_ENABLED)
-}
-
-if {$mmu_enabled == 0} {
-  set cmd_str "set mmu_enabled 0"
-  exec -ignorestderr $quartus(quartus_rootpath)/sopc_builder/bin/qsys-script \
-    --cmd=$cmd_str --script=system_qsys.tcl
-} else {
-  set cmd_str "set mmu_enabled 1"
-  exec -ignorestderr $quartus(quartus_rootpath)/sopc_builder/bin/qsys-script \
-    --cmd=$cmd_str --script=system_qsys.tcl
-}
+source $ad_hdl_dir/projects/common/altera/sys_gen.tcl