19.10.2024 - Clean up