The PACening

Cleanup v2

Change-Id: Iae1f253d898da1b988dd1cc2f26271698689607c