Revert "Final commit of from template version2"

This reverts commit 9efe17d2128b9ab65379eeb571c0e1684aeaa103.