ACCUMULO-3197 Remove deprecated code