Old comment clean up