diff --git a/.gitignore b/.gitignore
index 53c91384..2524739f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
 /docs/build
 /api-docs/build
 /api-docs/source/mediagoblin*
-/user_dev/*
+/user_dev/
 /paste_local.ini
 /mediagoblin_local.ini
 /mediagoblin.db
@@ -25,9 +25,6 @@
 /kombu.db
 /server-log.txt
 
-# Unignore theme directory
-!/user_dev/themes/
-
 # pyconfigure/automake generated files
 /Makefile
 /autom4te.cache/
diff --git a/.gitmodules b/.gitmodules
index a71a2ccd..20fa20e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
 [submodule "extlib/skeleton"]
 	path = extlib/skeleton
 	url = git://github.com/dhg/Skeleton.git
-[submodule "user_dev/themes/sandyseventiesspeedboat"]
-	path = user_dev/themes/sandyseventiesspeedboat
-	url = https://github.com/jpope777/sandyseventiesspeedboat-mg.git
diff --git a/user_dev/themes/sandyseventiesspeedboat b/user_dev/themes/sandyseventiesspeedboat
deleted file mode 160000
index 994294e5..00000000
--- a/user_dev/themes/sandyseventiesspeedboat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 994294e59a5248e29af4418903ce4fb40bd67bec