Cleaning up the leftovers