diff --git a/debian/changelog b/debian/changelog
index 1753f266..e24eed51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 byobu (4.18) unreleased; urgency=low
 
-  * UNRELEASED
+  * usr/bin/byobu, usr/bin/byobu-status:
+    - remove some redundancies
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 29 Jun 2011 02:26:28 +0000
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index 5d44117f..58f07576 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -21,9 +21,7 @@ VERSION=4.18
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.shutil"
-. "${BYOBU_PREFIX}/lib/${PKG}/.constants"
-
+. "${BYOBU_PREFIX}/lib/${PKG}/.common"
 
 # Add a version argument for debugging purposes
 if [ "$#" = "1" ]; then
diff --git a/usr/bin/byobu-status b/usr/bin/byobu-status
index 94477601..923e01e4 100755
--- a/usr/bin/byobu-status
+++ b/usr/bin/byobu-status
@@ -21,18 +21,6 @@ PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/.common"
 
-if ! . "${BYOBU_PREFIX}/lib/${PKG}/.shutil"; then
-	echo "failed to source ${BYOBU_PREFIX}/lib/${PKG}/.shutil" 2>&1
-	echo "If you have installed elsewhere, export BYOBU_PREFIX in your shell" 2>&1
-	exit 1
-fi
-
-if ! . "${BYOBU_PREFIX}/lib/${PKG}/.constants"; then
-	echo "failed to source ${BYOBU_PREFIX}/lib/${PKG}/.constants" 2>&1
-	echo "If you have installed elsewhere, export BYOBU_PREFIX in your shell" 2>&1
-	exit 1
-fi
-
 # Define colors
 ESC="\005"
 color() {