Revert "Added skip logic template/scripts and fields"

This reverts commit 4457aa1b571fc9b3dc52386dc2d151689808df4b.