[ #27451 ] Cleanup