Cleanup Xylon's Pie Control

Change-Id: Ic875b68ea775aa784d5df77bdd4224681872d1a8