Added more flag removals in IRQ handlers