diff --git a/.pairs b/.pairs
index c21a493f..0f0b99fd 100644
--- a/.pairs
+++ b/.pairs
@@ -5,5 +5,5 @@ pairs:
 
 email:
   prefix: pair
-  domain: vmware.com
+  domain: example.com
 
diff --git a/README.md b/README.md
index e863ee49..d976437e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Workstation Setup
 
-This project automates the process of setting up a new Pivotal machine using a simple [Bash](https://www.gnu.org/software/bash/) script.
+This project automates the process of setting up a new development machine using a simple [Bash](https://www.gnu.org/software/bash/) script.
 
 ## Goals
 
diff --git a/files/.pairs b/files/.pairs
index e50521a4..7500c797 100644
--- a/files/.pairs
+++ b/files/.pairs
@@ -1,8 +1,8 @@
 pairs:
-  bk: Brian Kelly; bkelly
-  ah: Ashraf Hanafy; ahanafy
+  # Examples below (without # comment of course):
+  # aa: Aaron A Aaronson; aaronson
+  # mm: Mary Miles; mmiles
 
 email:
   prefix: pair
-  domain: pivotal.io
-
+  domain: example.com
\ No newline at end of file
diff --git a/files/bobby_pivotal/bobby_pivotal.theme.bash b/files/bobby_pivotal/bobby_pivotal.theme.bash
deleted file mode 100644
index a90113bf..00000000
--- a/files/bobby_pivotal/bobby_pivotal.theme.bash
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-SCM_THEME_PROMPT_DIRTY=" ${red}✗"
-SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
-SCM_THEME_PROMPT_PREFIX=" |"
-SCM_THEME_PROMPT_SUFFIX="${green}|"
-
-GIT_THEME_PROMPT_DIRTY=" ${red}✗"
-GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓"
-GIT_THEME_PROMPT_PREFIX=" ${green}|"
-GIT_THEME_PROMPT_SUFFIX="${green}|"
-
-RVM_THEME_PROMPT_PREFIX="|"
-RVM_THEME_PROMPT_SUFFIX="|"
-
-# This Pivotal's customization of the bobby theme
-
-function prompt_command() {
-    PS1="\n$(battery_char) ${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
-}
-
-PROMPT_COMMAND=prompt_command;
diff --git a/scripts/common/git-aliases.sh b/scripts/common/git-aliases.sh
index c9956b7a..ef62cfe2 100755
--- a/scripts/common/git-aliases.sh
+++ b/scripts/common/git-aliases.sh
@@ -19,15 +19,4 @@ git config --global alias.fixup "commit --fixup"
 git config --global alias.squash "commit --squash"
 git config --global alias.amendit "commit --amend --no-edit"
 git config --global alias.unstage "reset HEAD"
-git config --global alias.rum "rebase master@{u}"
-if [ ! -d ~/.bash_it/aliases/enabled ]; then
-    mkdir ~/.bash_it/aliases/enabled
-fi
-echo "#Git" >> ~/.bash_it/aliases/enabled/general.aliases.bash
-echo "alias gst='git status'" >> ~/.bash_it/aliases/enabled/general.aliases.bash
-
-#Add git duet aliases
-echo "alias dci='git duet-commit'" >> ~/.bash_it/aliases/enabled/general.aliases.bash
-echo "alias drv='git duet-revert'" >> ~/.bash_it/aliases/enabled/general.aliases.bash
-echo "alias dmg='git duet-merge'" >> ~/.bash_it/aliases/enabled/general.aliases.bash
-echo "alias drb=\"git rebase -i --exec 'git duet-commit --amend --reset-author'\"" >> ~/.bash_it/aliases/enabled/general.aliases.bash
+git config --global alias.rum "rebase master@{u}"
\ No newline at end of file
diff --git a/setup.sh b/setup.sh
index 21302594..a703c233 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# setup.sh:  run the Pivotal workstation setup
+# setup.sh:  run the workstation setup
 #
 # Arguments:
 #   - a list of components to install, see scripts/opt-in/ for valid options