Update to use future
Remove useless templates