Further cleanup using getDevOption()