Removed more AndroidAnnotations