Revert "Include structs in dictionary for pivot"

This reverts commit 3008ba6cae5abc5f2dc8b4f7598a19cb3aba8358.
Remove structs from dictionary for everything in pivot