Remove custom pid handler