removed index/index-async, as well as tests for a much cleaner starting point