STORM-80 : Commenting options code for now