ACCUMULO-1934 cleaning up imports, dead code, unused vars