Revert "- Changes to the templates"

This reverts commit 343f3e8fdab84f03888b771dff16f4650920ed8f.