Remove annotations

Change-Id: If4abe895c28216a587cbc1e832347bad72206ac4