remove barf, add comment