Removed deprecated code

fixes #116