QPID-5710 : Address review comments from Keith Wall and remove unnecessary classes

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589801 13f79535-47bb-0310-9956-ffa450edef68