Revert "Added template and value mappings"

This reverts commit df9939c36d8985a2445653ec4b277c9313cb0a38.