Removed redundant code
Merge pull request #11 from WouterJ/removed_redundant_code

Removed redundant code