Strip extended handlebars comments

Change-Id: Ib1ddea3d2c0736a167a00122e126893ad8f9e99a