diff --git a/board/common/overlay/etc/profile b/board/common/overlay/etc/profile
index 31d3180c0d..28078e2bcc 100644
--- a/board/common/overlay/etc/profile
+++ b/board/common/overlay/etc/profile
@@ -1,12 +1,4 @@
-# ~/.bashrc: executed by bash(1) for non-login interactive shells.
-
-export PATH=\
-/bin:\
-/sbin:\
-/usr/bin:\
-/usr/sbin:\
-/usr/bin/X11:\
-/usr/local/bin
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 # If running interactively, then:
 if [ "$PS1" ]; then
@@ -29,27 +21,11 @@ if [ "$PS1" ]; then
     export HOSTNAME=`/bin/hostname`
     export HISTSIZE=1000
     export HISTFILESIZE=1000
-    export PAGER='/bin/more '
-    export EDITOR='/bin/vi'
-    export INPUTRC=/etc/inputrc
-    export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
-
-    ### Some aliases
-    alias ps2='ps facux '
-    alias ps1='ps faxo "%U %t %p %a" '
-    alias af='ps af'
-    alias cls='clear'
-    alias df='df -h'
-    alias indent='indent -bad -bap -bbo -nbc -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -cp33 -cs -d0 -di1 -nfc1 -nfca -hnl -i4 -ip0 -l75 -lp -npcs -npsl -nsc -nsob -nss -ts4 '
-    #alias bc='bc -l'
-    alias minicom='minicom -c on'
-    alias calc='calc -Cd '
-    alias bc='calc -Cd '
+    export PAGER="/usr/bin/less"
+    export EDITOR="/usr/bin/nano"
+    export INPUTRC="/etc/inputrc"
 fi;
 
-# Source configuration files from /etc/profile.d
-for i in /etc/profile.d/*.sh ; do
-    if [ -r "$i" ]; then
-        . $i
-    fi
-done
+if [ -f /data/etc/profile ]; then
+    source /data/etc/profile
+fi
diff --git a/board/common/skeleton/root/.bash_logout b/board/common/skeleton/root/.bash_logout
index 77ef1f9508..d0fb6fceb5 100644
--- a/board/common/skeleton/root/.bash_logout
+++ b/board/common/skeleton/root/.bash_logout
@@ -1,7 +1,6 @@
-# ~/.bash_logout: executed by bash(1) when login shell exits.
-
 # when leaving the console clear the screen to increase privacy
 
 case "`tty`" in
     /dev/tty[0-9]*) clear
 esac
+
diff --git a/board/common/skeleton/root/.bash_profile b/board/common/skeleton/root/.bash_profile
index 27bf14953d..01cdf1b624 100644
--- a/board/common/skeleton/root/.bash_profile
+++ b/board/common/skeleton/root/.bash_profile
@@ -1,15 +1,6 @@
-# .bash_profile
-
-export PATH=\
-/bin:\
-/sbin:\
-/usr/bin:\
-/usr/sbin:\
-/usr/bin/X11:\
-/usr/local/bin
-
 umask 022
 
 if [ -f ~/.bashrc ]; then
     source ~/.bashrc
 fi
+