Revert "Initial edits to P,C,W"

This reverts commit a7644bc07e345bdcce2fec6854fadd0e7722d51b.