Revert "PM: Some additions.."

This reverts commit 7b0ffdc884ed2e821ff63a40b8493cb3177423c0.
Revert "PM: setup initial OPP configuration"

This reverts commit 137e5ddecd7d229e13bb9fcba83fd69116d170cb.