ACCUMULO-1451 cleanup imports