Re-cleanup of unused option.