diff --git a/main.go b/main.go
index fda30b6fb..c7fec1ae1 100644
--- a/main.go
+++ b/main.go
@@ -9,11 +9,8 @@ import (
 	"os/user"
 	"path/filepath"
 
-	"github.com/davecgh/go-spew/spew"
-
 	"github.com/jesseduffield/lazygit/pkg/app"
 	"github.com/jesseduffield/lazygit/pkg/config"
-	git "gopkg.in/src-d/go-git.v4"
 )
 
 var (
@@ -23,9 +20,6 @@ var (
 
 	debuggingFlag = flag.Bool("debug", false, "a boolean")
 	versionFlag   = flag.Bool("v", false, "Print the current version")
-
-	w *git.Worktree
-	r *git.Repository
 )
 
 func homeDirectory() string {
@@ -41,37 +35,6 @@ func projectPath(path string) string {
 	return filepath.FromSlash(gopath + "/src/github.com/jesseduffield/lazygit/" + path)
 }
 
-func devLog(objects ...interface{}) {
-	localLog("development.log", objects...)
-}
-
-func objectLog(object interface{}) {
-	if !*debuggingFlag {
-		return
-	}
-	str := spew.Sdump(object)
-	localLog("development.log", str)
-}
-
-func commandLog(objects ...interface{}) {
-	localLog("commands.log", objects...)
-}
-
-func localLog(path string, objects ...interface{}) {
-	if !*debuggingFlag {
-		return
-	}
-	f, err := os.OpenFile(projectPath(path), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
-	if err != nil {
-		panic(err.Error())
-	}
-	defer f.Close()
-	log.SetOutput(f)
-	for _, object := range objects {
-		log.Println(fmt.Sprint(object))
-	}
-}
-
 // when building the binary, `version` is set as a compile-time variable, along
 // with `date` and `commit`. If this program has been opened directly via go,
 // we will populate the `version` with VERSION in the lazygit root directory
@@ -84,19 +47,6 @@ func fallbackVersion() string {
 	return string(byteVersion)
 }
 
-func setupWorktree() {
-	var err error
-	r, err = git.PlainOpen(".")
-	if err != nil {
-		panic(err)
-	}
-
-	w, err = r.Worktree()
-	if err != nil {
-		panic(err)
-	}
-}
-
 func main() {
 	flag.Parse()
 	if version == "unversioned" {
@@ -115,10 +65,6 @@ func main() {
 	}
 	app, err := app.NewApp(appConfig)
 	app.Log.Info(err)
-
 	app.GitCommand.SetupGit()
-	// TODO remove this once r, w not used
-	setupWorktree()
-
 	app.Gui.RunWithSubprocesses()
 }
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index aa524ce0d..c607ba79e 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -335,6 +335,7 @@ func (gui *Gui) RunWithSubprocesses() {
 				break
 			} else if err == ErrSubProcess {
 				gui.SubProcess.Run()
+				gui.SubProcess = nil
 			} else {
 				log.Panicln(err)
 			}