fix warnings: remove redundant generics (Java 7), add missing @override