Minor token deletion cleanup and comments