ACCUMULO-3167 Some more dead code