Generic comment clean up