Remove square brackets to simplify parser