Remove HTML munging
Remove duplicate flatten and rename collect