Removed custom PID handler