Non-functional cleanup:

Java 7 diamonds
Remove not-needed signatures of interface methods in an abstract class
Remove not-needed @inheritDoc and @see Interface javadocs