Fixes issue #57 by removing deprecated code