Updated Javadoc.
Removed stale interfaces.
Removed stale nested class.