Get rid of tags for #31