GPII-118: Removed commented out markup from panel templates