Remove old templating code