Merge "remove some logs"