Clean Up and add PacPerformance

Change-Id: I01d40a373eda8b08ddf1bb9b5af3cacc1b935a8e