diff --git a/repo-cleanup.cmd b/repo-cleanup.cmd
index 7f7cfb2..2353c9c 100644
--- a/repo-cleanup.cmd
+++ b/repo-cleanup.cmd
@@ -2,13 +2,17 @@
 TITLE Clean up Unity Project repo
 SETLOCAL EnableDelayedExpansion
 
-CALL :cleanup --dry-run || GOTO die
+CD "%~dp0"
+git rev-parse --is-inside-work-tree >NUL || GOTO die
 
+git clean -dfX --dry-run "%~dp0."  || GOTO die
+
+ECHO.
 CHOICE /M "Execute"
 IF !ERRORLEVEL! NEQ 1 (
 	ECHO Aborting cleanup...
 ) ELSE (
-	CALL :cleanup || GOTO die
+	git clean -dfX "%~dp0." || GOTO die
 	ECHO Done.
 )
 
@@ -19,8 +23,3 @@ EXIT /B 0
 :die
 PAUSE
 EXIT /B %ERRORLEVEL%
-
-
-:cleanup
-	git clean -dfX %* "%~dp0." || EXIT /B
-	EXIT /B 0
diff --git a/repo-cleanup.sh b/repo-cleanup.sh
index 4714ad9..78d0f39 100755
--- a/repo-cleanup.sh
+++ b/repo-cleanup.sh
@@ -1,30 +1,18 @@
-#!/bin/sh
+#!/bin/sh -e
 
-me="$(realpath "$0")"
-repository="$(dirname "$me")/."
+repository="$(dirname "$(readlink -f "$0")")/."
 
-# I have no mouth but i must scream
-if [ ! -t 0 ]; then
-    if command -v x-terminal-emulator >/dev/null 2>&1; then
-        x-terminal-emulator -e "$me"
-    elif command -v xdg-terminal >/dev/null 2>&1; then
-        xdg-terminal "$me"
-    else
-        echo "Run me from the fucking terminal!" >"${me}.README"
-        exit 1
-    fi
-    exit 0
-fi
+cd "${repository}"
+git rev-parse --is-inside-work-tree >/dev/null
 
 git clean -dfX --dry-run "${repository}"
 
-printf "Execute [Y,N]?"; read -r yn
-if [ "$yn" = "${yn#[Yy]}" ] ;then 
+printf "\nExecute [Y,N]?"; read -r yn
+if [ "$yn" = "${yn#[Yy]}" ]; then 
     echo "Aborting cleanup..."
 else
     git clean -dfX "${repository}"
     echo "Done."
 fi
 
-printf "Press any key to continue..."; read -r _
 exit 0