diff --git a/gui/gui.cpp b/gui/gui.cpp
deleted file mode 100644
index e30af1f4..00000000
--- a/gui/gui.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2014 (c) Anna Schumaker.
- */
-#include <core/audio.h>
-#include <core/deck.h>
-#include <core/playlist.h>
-#include <core/print.h>
-#include <lib/colmgr.h>
-#include <lib/lib.h>
-
-#include <gui/ocarina.h>
-#include <gui/tabs.h>
-
-
-/*
- * Ocarina functions
- */
-void connect_button(const std::string &name, void (*func)())
-{
-	lib :: get_widget<Gtk::Button>(name)->signal_clicked().connect(sigc::ptr_fun(func));
-}
-
-Gtk::Window *setup_gui()
-{
-	if (audio :: current_track())
-		on_track_loaded(audio :: current_track());
-
-	/* Set up other tabs */
-	collection_mgr_init();
-	init_tabs();
-	return window_init();
-}
diff --git a/gui/main.cpp b/gui/main.cpp
index 4f456a68..00973201 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -7,8 +7,15 @@
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
 
+void connect_button(const std::string &name, void (*func)())
+{
+	lib :: get_widget<Gtk::Button>(name)->signal_clicked().connect(sigc::ptr_fun(func));
+}
+
 Gtk::Window *ocarina_init(int *argc, char ***argv)
 {
+	Gtk::Window *window;
+
 	lib :: init(argc, argv, "ocarina6.glade");
 
 	init_gst(argc, argv);
@@ -16,7 +23,9 @@ Gtk::Window *ocarina_init(int *argc, char ***argv)
 
 	core :: init();
 
-	Gtk::Window *window = setup_gui();
+	collection_mgr_init();
+	init_tabs();
+	window = window_init();
 	post_init_tabs();
 	return window;
 }
diff --git a/include/gui/ocarina.h b/include/gui/ocarina.h
index 5a032807..3c5fbcc1 100644
--- a/include/gui/ocarina.h
+++ b/include/gui/ocarina.h
@@ -14,11 +14,8 @@ void collection_mgr_init();
 
 /* main.cpp */
 Gtk::Window *ocarina_init(int *, char ***);
-
-
-/* gui.cpp */
 void connect_button(const std::string &, void (*func)());
-Gtk::Window *setup_gui();
+
 
 void on_pq_created(Queue *, unsigned int);
 void on_track_loaded(Track *);