diff --git a/dotfiles/z_profile b/dotfiles/z_profile
index ed95cb3..752a26b 100644
--- a/dotfiles/z_profile
+++ b/dotfiles/z_profile
@@ -1,8 +1,3 @@
-{%@@ if profile == 'WVDEWOBMC001307' @@%}
-# Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zprofile.pre.zsh" ]] && . "$HOME/.fig/shell/zprofile.pre.zsh"
-{%@@ endif @@%}
-
 #
 # {{@@ header() @@}}
 #
@@ -21,9 +16,10 @@ export EDITOR
 export PATH="$PATH:/Users/vw6au89/Library/Application Support/JetBrains/Toolbox/scripts"
 {%@@ endif @@%}
 
+# Initialize pyenv
 [[ $(command -v pyenv) ]] && export PYENV_ROOT="$HOME/.pyenv"
-[[ $(command -v pyenv) ]] && export PATH="$PYENV_ROOT/bin:$PATH"
-[[ $(command -v pyenv) ]] && eval "$(pyenv init --path)"
+[[ $(command -v pyenv) ]] && command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+[[ $(command -v pyenv) ]] && eval "$(pyenv init -)"
 
 {%@@ if profile == 'AINCRAD-wsl' or profile == 'AINCRAD' or profile == 'YOETUNHEIMR-wsl' or profile == 'yoetunheimr' @@%}
 # Set DOTNET_ROOT enviroment variable
@@ -41,8 +37,3 @@ export XDG_CONFIG_HOME
 # Run VPN-Kit alpine VM to route traffic through Windows and if connected through VPNs
 wsl.exe -d wsl-vpnkit service wsl-vpnkit start
 {%@@ endif @@%}
-
-{%@@ if profile == 'WVDEWOBMC001307' @@%}
-# Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zprofile.post.zsh" ]] && . "$HOME/.fig/shell/zprofile.post.zsh"
-{%@@ endif @@%}
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index d7e3f9a..84a7d00 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -1,8 +1,3 @@
-{%@@ if profile == 'WVDEWOBMC001307' @@%}
-# Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh"
-{%@@ endif @@%}
-
 #
 # {{@@ header() @@}}
 #
@@ -163,6 +158,9 @@ source ${ZSH}/oh-my-zsh.sh
 alias ssh-no-check="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
 
 # Initialize pyenv
+[[ $(command -v pyenv) ]] && export PYENV_ROOT="$HOME/.pyenv"
+[[ $(command -v pyenv) ]] && command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+[[ $(command -v pyenv) ]] && eval "$(pyenv init -)"
 
 # Enable pipx completions
 if [ -f "{{@@ env['HOME'] @@}}/.local/bin/pipx" ]; then
@@ -254,10 +252,6 @@ function setVpnGitRemote(){
 
   echo -e "🔗 git remote (${HIGHLIGHT}${ORIGIN}${RESET}): ${HIGHLIGHT}${repo}${RESET}\n"
 }
-
-
-# Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh"
 {%@@ endif @@%}
 
 {%@@ if profile == 'ymir' @@%}