diff --git a/anaconda_env b/anaconda_env
old mode 100755
new mode 100644
index 142f79a..897bb71
--- a/anaconda_env
+++ b/anaconda_env
@@ -6,7 +6,6 @@
 #fi
     
 dest=/sf/bernina/anaconda/4.4.0
-#dest=/sf/bernina/anaconda/ahl
 
 echo Loading PSI Anaconda Python distribution 3.6
 module load psi-python36/4.4.0
diff --git a/anaconda_testenv b/anaconda_testenv
deleted file mode 100755
index ccb8033..0000000
--- a/anaconda_testenv
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-#if [ $# != 1  ]; then
-#    echo "Usage: $0 [alvra|bernina]"
-#    exit 1
-#fi
-    
-dest=/sf/bernina/anaconda/ahl
-
-echo Loading PSI Anaconda Python distribution 3.6
-module load psi-python36/4.4.0
-
-echo Activating BERNINA Conda environment
-source activate $dest
-
diff --git a/chrome b/chrome
deleted file mode 100755
index d5a7093..0000000
--- a/chrome
+++ /dev/null
@@ -1,2 +0,0 @@
-#/bin/bash
-google-chrome --user-data-dir=$HOME/.config/chrome-profiles/$HOSTNAME "$@"
diff --git a/chromeAs b/chromeAs
index d0b149b..8c15ad4 100755
--- a/chromeAs
+++ b/chromeAs
@@ -8,6 +8,4 @@
 #}
 #set-title "chrome terminal"
 
-
-#gnome-terminal -x sh -c "export XDG_RUNTIME_DIR=/run/user/$UID; su - $1 -c chrome"
-gnome-terminal -x sh -c "su - $1 -c chrome"
+gnome-terminal -e "su $1 -c google-chrome"
diff --git a/chrome_as b/chrome_as
deleted file mode 100755
index d1c7520..0000000
--- a/chrome_as
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-#function set-title() {
-#  if [[ -z "$ORIG" ]]; then
-#    ORIG=$PS1
-#  fi
-#  TITLE="\[\e]2;$*\a\]"
-#  PS1=${ORIG}${TITLE}
-#}
-#set-title "chrome terminal"
-
-
-#gnome-terminal -x sh -c "export XDG_RUNTIME_DIR=/run/user/$UID; su - $1 -c chrome"
-PASSWD="$(zenity --password --title=Chrome as User)\n"
-
-echo -e "$PASSWD" | sudo -u $1 -S chrome
diff --git a/eco b/eco
index a7e6af4..7082696 100755
--- a/eco
+++ b/eco
@@ -1,6 +1,9 @@
 #/bin/bash
-#source /opt/gfa/python
-source anaconda_env
-export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python/eco
-python /sf/bernina/config/src/python/eco/startup.py -s bernina "$@" -l
+source /opt/gfa/python
+export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python
+ipython --pylab --no-banner -c "\
+print('                       ___ _______\n                      / -_) __/ _ \ \n Experiment Control   \__/\__/\___/ \n\n');\
+from eco.instruments import bernina;\
+from eco.instruments.bernina import *;\
+" -i
 
diff --git a/eco_bams_bpms b/eco_bams_bpms
deleted file mode 100755
index cbce0a1..0000000
--- a/eco_bams_bpms
+++ /dev/null
@@ -1,9 +0,0 @@
-#/bin/bash
-#source /opt/gfa/python
-source anaconda_env
-export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python
-ipython --pylab --no-banner -c "\
-from eco_bams_bpms.instruments import bernina;\
-import eco_bams_bpms.instruments.bernina *;\
-" -i
-
diff --git a/eco_dev b/eco_dev
deleted file mode 100755
index c72c202..0000000
--- a/eco_dev
+++ /dev/null
@@ -1,14 +0,0 @@
-#/bin/bash
-PS1=$PS1"\[\e]2;eco_dev - Bernina \a\]"
-source anaconda_env
-export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python/devel
-ipython --pylab --no-banner -c "\
-print('                       ___ _______\n                      / -_) __/ _ \ \n Experiment Control   \__/\__/\___/ \n\n');\
-import h5py;\
-h5py.enable_ipython_completer();\
-import IPython.utils as _ipy_utils;\
-_ipy_utils.terminal.set_term_title('eco_dev Bernina');\
-from eco.instruments import bernina;\
-from eco.instruments.bernina import *;\
-" -i
-
diff --git a/eco_dev~ b/eco_dev~
deleted file mode 100755
index 2d2c662..0000000
--- a/eco_dev~
+++ /dev/null
@@ -1,9 +0,0 @@
-#/bin/bash
-source anaconda_env
-export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python/devel
-ipython --pylab --no-banner -c "\
-print('                       ___ _______\n                      / -_) __/ _ \ \n Experiment Control   \__/\__/\___/ \n\n');\
-from eco.instruments import bernina;\
-from eco.instruments.bernina import *;\
-" -i
-
diff --git a/eco_old b/eco_old
deleted file mode 100755
index 6ea0ee2..0000000
--- a/eco_old
+++ /dev/null
@@ -1,17 +0,0 @@
-#/bin/bash
-#source /opt/gfa/python
-source anaconda_env
-export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python
-ipython --profile=operation --pylab --no-banner -c "\
-print('                       ___ _______\n                      / -_) __/ _ \ \n Experiment Control   \__/\__/\___/ \n\n');\
-import h5py;\
-h5py.enable_ipython_completer();\
-import IPython.utils as _ipy_utils;\
-_ipy_utils.terminal.set_term_title('eco Bernina');\
-
-from eco_old.instruments import bernina;\
-from eco_old.instruments.bernina import *;\
-from escape.parse.swissfel import parseScanEco_v01;\
-#%config IPCompleter.use_jedi=True;\
-" -i
-
diff --git a/google-chrome b/google-chrome
deleted file mode 100755
index d5a7093..0000000
--- a/google-chrome
+++ /dev/null
@@ -1,2 +0,0 @@
-#/bin/bash
-google-chrome --user-data-dir=$HOME/.config/chrome-profiles/$HOSTNAME "$@"
diff --git a/hdfview b/hdfview
deleted file mode 100755
index 72d7945..0000000
--- a/hdfview
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-module add HDFView
-HDFView $@
-
diff --git a/laseroff b/laseroff
deleted file mode 100755
index 471e007..0000000
--- a/laseroff
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-caput SLAAR21-LTIM01-EVR0:FrontUnivOut3_SOURCE2 "HIGH"
diff --git a/laseron b/laseron
deleted file mode 100755
index 85f78a8..0000000
--- a/laseron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-caput SLAAR21-LTIM01-EVR0:FrontUnivOut3_SOURCE2 "LOW"
diff --git a/phonebook b/phonebook
deleted file mode 100755
index 422b9d1..0000000
--- a/phonebook
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-clear
-cat /sf/bernina/config/phonelist
diff --git a/pshell_be b/pshell_be
index 39236b3..82cfe73 100755
--- a/pshell_be
+++ b/pshell_be
@@ -2,6 +2,7 @@
 
 /opt/gfa/pshell/pshell \
      -jvmarg="-Duser.home=/sf/bernina/data"  \
+     -last \
      -dlaf \
      -r \
      -py3 \
diff --git a/rdpWater b/rdpWater
deleted file mode 100755
index 19a5015..0000000
--- a/rdpWater
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-xfreerdp -u WaterLab --no-nla -d WORKGROUP -g 1500x1000 WaterT450s
diff --git a/remoteDesktop b/remoteDesktop
index 79cae83..501dba9 100755
--- a/remoteDesktop
+++ b/remoteDesktop
@@ -1,2 +1,2 @@
 #!/bin/bash
-xfreerdp -u $1 --no-nla -d PSICH -g 2560x1600 $2
+xfreerdp -u $1 --no-nla -d PSICH -g 2000x1000 $2
diff --git a/restart_service b/restart_service
deleted file mode 100755
index 5d4138f..0000000
--- a/restart_service
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-sudo su - dbe
-sudo systemctl restart $1.service
-sleep 5
-ech "done sleeping"
-exit
-
diff --git a/screen_panel b/screen_panel
index cdecbbd..a724597 100755
--- a/screen_panel
+++ b/screen_panel
@@ -3,13 +3,13 @@
 
 /opt/gfa/pshell/pshell \
      -jvmarg="-Duser.home=/sf/bernina/data"  \
-     -dlaf \
+     -test -dlaf \
      -home=/sf/bernina/config/pshell_be \
      -data=/sf/bernina/config/pshell_data \
      -l -d -k -q -b -e -g -n -buf=10 -poll=250 -clog=SEVERE \
      -p=SfCamera.java \
      -p=Inventory.java \
      -p=CameraCalibrationDialog.java \
-     -p=ScreenPanel3.java \
+     -p=ScreenPanel2.java \
      -srv_url=sf-daqsync-01:8889 -cam_srv_url=sf-daqsync-01:8888 $@
 
diff --git a/screen_panel_100pulseAvg b/screen_panel_100pulseAvg
deleted file mode 100755
index 131332c..0000000
--- a/screen_panel_100pulseAvg
+++ /dev/null
@@ -1,2 +0,0 @@
-#/bin/bash
-/sf/op/bin/screen_panel -integration=100
diff --git a/screen_panel_10pulseAvg b/screen_panel_10pulseAvg
deleted file mode 100755
index fb6ed84..0000000
--- a/screen_panel_10pulseAvg
+++ /dev/null
@@ -1,2 +0,0 @@
-#/bin/bash
-/sf/op/bin/screen_panel -integration=10
diff --git a/termAs b/termAs
deleted file mode 100755
index 365ac50..0000000
--- a/termAs
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#function set-title() {
-#  if [[ -z "$ORIG" ]]; then
-#    ORIG=$PS1
-#  fi
-#  TITLE="\[\e]2;$*\a\]"
-#  PS1=${ORIG}${TITLE}
-#}
-#set-title "chrome terminal"
-
-#gnome-terminal -e "bash - -c 'su - $1;$SHELL'"
-su - $1 -c "gnome-terminal -x sh -c 'su - $1;$SHELL'"
-#gnome-terminal -x sh -c "su - $1 -c chrome"
diff --git a/terminalAs b/terminalAs
index 39ee2f4..b412150 100755
--- a/terminalAs
+++ b/terminalAs
@@ -8,5 +8,4 @@
 #}
 #set-title "chrome terminal"
 
-#gnome-terminal -e "bash - -c 'su - $1;$SHELL'"
-gnome-terminal -x sh -c "su - $1;$SHELL"
+gnome-terminal -e "bash -c 'su $1;$SHELL'"
diff --git a/useful_commands b/useful_commands
deleted file mode 100755
index 2b85ae1..0000000
--- a/useful_commands
+++ /dev/null
@@ -1,4 +0,0 @@
-#/bin/bash
-clear
-cat /sf/bernina/config/help_commands
-