2025-08-06-#25 Clean it up