Remove templates in favour of FP ones