Fix some checkstyle exceptions, and remove entries from the checkstyle suppressions file.

Obsolete one class where we can use Guava instead.