Removed optionmap types.