Make the cleanup actually work