Ripping out Jade.  Cleaning up tmpls.