remove *~ and add new semantic annotations