Merge "Cleanup logs" into main