5.14.23 - small cleanup