Revert "Sherin added some SOP code"

This reverts commit 3979102437897fe868f039aad0bc98bf675e0810.