Kit for #26398 : clean up