Removing old templating system