Add some PM related clean up
More changes to PM
Use mdp resources