massage old annotations