ACCUMULO-1640 Remove unnecessary exception and clean up imports