Merge pull request #262 from benma/cleanup

Removed unused transport/message code