comment clean up done