Cleaning up after days of messy debugging