disabled options support, small cleanup