adding code for removing templating
why the f is this not committed