fix options support and remove unused fields