Removing deprecated code
Merge pull request #210 from caelum/ot-remove-xstream-deprecated-code

Removing deprecated code from XStream