Final cleanup before v1.15.8 release