Removed some superfluous code
Merge pull request #2 from ehenneken/cleanup

Removed some superfluous code