Title: Cleaning up the mess