Remove deprecated Org options