Minor changes
Minor javadoc. Unused obsolete code.
Unsubscribe message name refactored to UnsubscribeRequest