Remove hard coded brackets. Use 'brackets' key instead

Change-Id: I66ec94536ab3b22130c961b66e8b03384c8f9e3c