Revert "NewOption ontology improvements"

This reverts commit 0c4eabc2db99f60ef6a72f0c874a1f6bfe8b0926.