diff --git a/setup-linux.sh b/setup-linux.sh
index dfd5f6f..d2d307b 100755
--- a/setup-linux.sh
+++ b/setup-linux.sh
@@ -51,9 +51,9 @@ function update_system() {
 
 function install_general_tools_software() {
     if [[ $DISTRO =~ (debian|ubuntu) ]]; then
-        sudo apt install linux-headers-amd64 sudo nano bat git curl wget htop btop scrcpy vlc geary -y
+        sudo apt install linux-headers-amd64 sudo nano bat git curl wget htop btop scrcpy vlc -y
     elif [[ $DISTRO == "fedora" ]]; then
-        sudo dnf in kernel-devel sudo nano bat git curl wget htop btop geary -y
+        sudo dnf in kernel-devel sudo nano bat git curl wget htop btop -y
     elif [[ $DISTRO == "arch" ]]; then
         kernel_version=$(uname -r)
         if [[ $kernel_version == *zen* ]]; then
@@ -63,7 +63,7 @@ function install_general_tools_software() {
         else
             sudo pacman -S --needed --noconfirm linux-headers
         fi
-        sudo pacman -S --needed --noconfirm dkms base-devel syslinux sudo nano bat git curl wget htop btop scrcpy vlc phonon-qt5-vlc geary noto-fonts-emoji noto-fonts-extra noto-fonts-cjk reflector
+        sudo pacman -S --needed --noconfirm dkms base-devel syslinux sudo nano bat git curl wget htop btop scrcpy vlc phonon-qt5-vlc noto-fonts-emoji noto-fonts-extra noto-fonts-cjk reflector
         sudo reflector --save /etc/pacman.d/mirrorlist --protocol https
         if [ -d "/sys/class/power_supply/BAT0" ]; then
             sudo pacman -S --needed --noconfirm tlp
@@ -87,8 +87,6 @@ function setup_repo() {
     elif [[ $DISTRO == "fedora" ]]; then
         sudo dnf copr enable varlad/onefetch -y
         sudo dnf copr enable atim/heroic-games-launcher -y
-        sudo dnf copr enable atim/starship -y
-        sudo dnf copr enable zeno/scrcpy -y
         sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
         if grep -q "Rawhide" /etc/fedora-release; then
             sudo dnf config-manager --add-repo 'https://download.opensuse.org/repositories/hardware:razer/Fedora_Rawhide/hardware:razer.repo'