Removed unneeded code
Fixes issue #29