more robust annotation removal