so simplify the parser and drop the square brackets

Change-Id: I3bab5f5b14e57d0cd1ed1a383fe21968f97b243a