Pre 2.3.0 release cleanup