Removed unnecessary test for options