Fixed bug in PID removal 2