Remove disabled_ variable entirely