We do not use option groups, so drop related code