removed Type from indexer.
started major indexer cleanup. very broken.
more minor cleanup.