clean up of comments and logs