Zapped unused flag/detection/comment fields
Added more debug timing logging