[merged upstream] cleanup