Revert "ching"

This reverts commit 4d0d437dfcda067e7175d48765acc1a2eaaeec9a.
removed pid
fixing merging