diff --git a/Makefile b/Makefile
index 1814648..e95876a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,26 +40,6 @@
 	CARAVEL_TAG := $(MPW_TAG)
 endif
 
-pdk-with-sram: pdk
-.PHONY: pdk
-pdk: check-env run_volare gen-sources
-
-.PHONY: clean-pdk
-clean-pdk:
-	rm -rf $(PDK_ROOT)
-
-.PHONY: run_volare
-run_volare:
-	@volare enable -f $(OPENLANE_ROOT)/dependencies/tool_metadata.yml
-
-.PHONY: gen-sources
-gen-sources:
-	@touch $(PDK_ROOT)/sky130A/SOURCES
-	@printf "skywater-pdk " >> $(PDK_ROOT)/sky130A/SOURCES
-	@echo $(SKYWATER_COMMIT) >> $(PDK_ROOT)/sky130A/SOURCES
-	@printf "open_pdks " >> $(PDK_ROOT)/sky130A/SOURCES
-	@echo $(OPEN_PDKS_COMMIT) >> $(PDK_ROOT)/sky130A/SOURCES
-
 # Include Caravel Makefile Targets
 .PHONY: % : check-caravel
 %:
@@ -80,7 +60,7 @@
 	docker pull efabless/dv_setup:latest
 
 .PHONY: setup
-setup: install check-env install_mcw openlane pdk
+setup: install check-env install_mcw openlane pdk-with-volare
 
 # Openlane
 blocks=$(shell cd openlane && find * -maxdepth 0 -type d)
@@ -217,15 +197,11 @@
 		exit 1; \
 	fi
 
-.PHONY: check-env
-check-env:
-ifndef PDK_ROOT
-	$(error PDK_ROOT is undefined, please export it before running make)
-endif
-ifeq ($(shell which volare),)
-	echo "volare is not found, Installing it..."
-	python3 -m pip install volare
-endif
+check-pdk:
+	@if [ ! -d "$(PDK_ROOT)" ]; then \
+		echo "PDK Root: "$(PDK_ROOT)" doesn't exists, please export the correct path before running make. "; \
+		exit 1; \
+	fi
 
 .PHONY: help
 help:
@@ -233,4 +209,3 @@
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
 
 
-