Remove early_demand option