Get rid of st_comment