cleanup OOS handling for island analysis