FINAL CLEAN UP OF 2024