Deleted redundant class, and added annotations to those classes missing them.

Also meant "excessive warnings" in the previous message...