Removed dead code. Fix for issue #22
Merge pull request #25 from orangemug/remove_dead_code

Removed dead code. Fix for issue #22