Revert "Merge branch 'touch-clone' into merge-pool"

I think this caused all the problems.
Remove templates
Not fit for this branch.
Updated files to current version