cleanup of logs and comments