QPID-5578 : Remove unusued contants and tidy up other code

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