Reverted the change in delete_option from the previous commit
Revert "Reverted the change in delete_option from the previous commit"

The problem wasn't in this particular change, deleting an option is not
working anymore.

This reverts commit 3937503f5d52d50241e2ddcadeca0c3647a0ce97.
Fixed a bug with adding sub question, sub cataogry questions