some more cleaning of annotations