Cleanup for Josh 3-16-26