CHG: optimization removed for now