Remove redundant modifiers

Remove redundant modifiers

* Use <?> instead of <? extends Object>.
* Delete unnecessary semi-colons.
* Drop public static from interface members (they're the default).
* Drop final from static methods (it's the default).
* Drop private from enum constructors (it's the default).
* Collapse common exception handlers.
* Clean up obsolete imports.

Change-Id: I8f7f74a126f558cba0a99fd0b7376cfdbccc4390
Signed-off-by: Stephen Kitt <skitt@redhat.com>