Revert "Cleanup PC" also update PC

This reverts commit 6ece6cbe11440449bb94b8d56f37d9cca215ef91.