Fix Lint
Remove android annotations