Revert "Add separate fishery and survey indices"

This reverts commit 9911685a026d205b639cd8cefd700d0416bd90bd.
add separate survey and fishery indices