diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstrun b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
index 9c00eeceb9..6a6a55df9b 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstrun
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
@@ -15,25 +15,10 @@
 case "$1" in
 	start)
 
-	# read number of cores needed below
-	cpu_cores=$(grep -c '^processor' /proc/cpuinfo | sed 's/^0$/1/')
-
-	# adjust custom htop initial configuration based on CPU count https://github.com/avafinger/htop-2.1.1_enhanced-version
-	right_meters="Hostname Tasks LoadAverage DiskIO NetworkIO Uptime Systemd CpuFreq"
-	right_meter_modes="2 2 2 2 2 2 2 2"
-	sed -i 's/header_margin=.*/header_margin=1/g' /etc/skel/.config/htop/htoprc
-	sed -i 's/left_meters=.*/left_meters=AllCPUs Memory Zram Swap CpuTemp/g' /etc/skel/.config/htop/htoprc
-	sed -i 's/left_meter_modes=.*/left_meter_modes=1 1 1 1 2/g' /etc/skel/.config/htop/htoprc
-	sed -i "s/right_meters=.*/right_meters=$right_meters/g" /etc/skel/.config/htop/htoprc
-	sed -i "s/right_meter_modes=.*/right_meter_modes=$right_meter_modes/g" /etc/skel/.config/htop/htoprc
-	# copy predefined settings for root user
-	cp -R /etc/skel/.config /root/
-
 	# Run a q&d benchmark to be able to identify cards way too slow easily
 	echo -e "\n### quick iozone test:$(cd /root; iozone -e -I -a -s 1M -r 4k -i 0 -i 1 -i 2 | grep '^            1024' | sed 's/            1024      //')" >> $Log
 
 	# Bluetooth tweaks
-
 	case ${BOARD} in
 		cubietruck)
 			systemctl enable brcm40183-patch && service brcm40183-patch start
@@ -69,12 +54,6 @@ case "$1" in
 	# get rid of purple background color in newt apps whiptail, partimage, debconf ... Reverting to Debian look.
 	[[ -f /etc/newt/palette ]] && sed -e 's/magenta/blue/g' -i /etc/newt/palette
 
-	# desktop tweaks - enable show windows content on stronger boards
-	if [[ ${cpu_cores} -gt 2 && -f /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]]; then
-		sed -i 's/<property name="box_move" type="bool" value=".*/<property name="box_move" type="bool" value="false"\/>/g' \
-		/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
-	fi
-
 	# randomize mac in armbianEnv.txt
 	if [[ -f /boot/armbianEnv.txt ]]; then
 		generate_random_mac