Simplify ANR handling

Thanks @Tungstwenty for reviewing