Remove deprecated options support