Removed unused code
Merge pull request #26 from ebu/remove_unused_code

Removed unused code