Removed old compatibility code
Merge pull request #3 from enumag/patch-3

Removed old compatibility code