remove indexes for now, review code