Revert "ZAPP-191 Test for if options foreign key link is causing issues"
Revert "ZAPP-191 Test for if options foreign key link is causing issues"

This reverts commit 2ecfafba438b613257ff93cba9cb755c40a16492.
This was not the cause of the foreign key constraint issue.

project-chip/zap,project-chip/zap,project-chip/zap,project-chip/zap