Deleted unused IOptionsContainer and IOptionValuesContainer