Removed unused class
Cleaned-up javadoc markup
Removing unnecessary interfaces.
Moving logic to marshaling classes.