Remove deprecated code. Fixes #110