Added more annotations.

and removed one field and two methods.