move index removal to setUp