corrected token cleanup