Removed dead code. Fix for issue #22