Remove old templating fun stuff