diff --git a/bin/basestrap.in b/bin/basestrap.in
index 9e7c0d1..acb66cc 100644
--- a/bin/basestrap.in
+++ b/bin/basestrap.in
@@ -46,7 +46,6 @@ usage() {
 #   exit $(( $# ? 0 : 1 ))
 # fi
 #
-# (( EUID == 0 )) || die 'This script must be run with root privileges'
 
 orig_argv=("$@")
 
@@ -108,8 +107,6 @@ fi
 if ${copymirrorlist}; then
 	# install the host's mirrorlist onto the new root
 	cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
-	#cp -a ${PKGDATADIR}/pacman-mirrors-${branch}.conf "$newroot/etc" #/pacman.d/"
-	#pacman-mirrors -g -b ${branch}
 fi
 
 # vim: et ts=2 sw=2 ft=sh:
diff --git a/bin/buildpkg.in b/bin/buildpkg.in
index e9d2a6d..b740b68 100644
--- a/bin/buildpkg.in
+++ b/bin/buildpkg.in
@@ -185,10 +185,8 @@ ${wipe_clean} && clean_up
 
 [[ -d ${work_dir}/root ]] && check_chroot_version
 
-#[[ $(get_branch) != ${branch} ]] && set_branch "${branch}"
-
 chroot_init
-fix_pacman_conf "${work_dir}/root"
-chroot_build
 
-#reset_branch
+fix_pacman_conf "${work_dir}/root"
+
+chroot_build