comments and elogs cleanup