tiny bit of cleanup, indexing still taking an order of magnitude longer... Possible rewrite necessary
removed stale class