Revert "Revamped with template insert"

This reverts commit 40c0777c386f423a1e3512f3e3b03c96dea71f90.