cleaned out some now-unnecessary cruft (that's been rolled into the main templating system)