Merge "Remove annotations that have been relocated"