Index: package_branches/invirt-web/cherrypy-rebased/code/Makefile
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/Makefile	(revision 2694)
+++ package_branches/invirt-web/cherrypy-rebased/code/Makefile	(revision 2695)
@@ -1,5 +1,3 @@
-DIRS = templates
-
-all: kill chmod compile
+all: kill chmod
 
 chmod:
@@ -9,12 +7,2 @@
 kill:
 	-pkill main.fcgi
-
-compile:
-	for dir in $(DIRS); do \
-		(cd $$dir; $(MAKE) all); \
-	done
-
-clean:
-	for dir in $(DIRS); do \
-		(cd $$dir; $(MAKE) clean); \
-	done
Index: package_branches/invirt-web/cherrypy-rebased/code/templates/Makefile
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/templates/Makefile	(revision 2694)
+++ 	(revision )
@@ -1,13 +1,0 @@
-TEMPLATES=$(wildcard *.tmpl)
-OUTPUTS=$(TEMPLATES:.tmpl=.py)
-
-all: ${OUTPUTS}
-
-%.py: %.tmpl
-	cheetah compile $<
-
-#${OUTPUTS}:${TEMPLATES}
-#	cheetah compile $^
-
-clean:
-	@rm -f ${OUTPUTS} *.pyo *.pyc *.py.bak
Index: package_branches/invirt-web/cherrypy-rebased/code/templates/__init__.py
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/templates/__init__.py	(revision 2694)
+++ 	(revision )
@@ -1,9 +1,0 @@
-__all__ = 'info command error error_raw help invalid list unauth vnc'.split()
-for _name in __all__:
-    try:
-        _module = __import__(_name, globals(), {}, [_name])
-        globals()[_name] = getattr(_module, _name)
-    except ImportError, e:
-        import sys
-        print >> sys.stderr, 'Importing template "%s" raised error: %s' % (_name, e)
-        
Index: package_branches/invirt-web/cherrypy-rebased/code/templates/create.tmpl
===================================================================
--- package_branches/invirt-web/cherrypy-rebased/code/templates/create.tmpl	(revision 2694)
+++ 	(revision )
@@ -1,15 +1,0 @@
-#from skeleton import skeleton
-#extends skeleton
-
-#def title
-Created!
-#end def
-
-#def body
-#if $machine
-<p>Congratulations!  You have a new machine named ${machine.name}.</p>
-#else
-<p>Odd... no error, but no machine.</p>
-#end if
-<p><a href="list">Return</a></p>
-#end def