Remove grouping logic form template file as it does not apply anymore