More meteor-like way of handling templates etc.
Removed some old code.