3.17 release cleanup