Not used and causing problems, Goodbye!

Change-Id: I6f873865aed712a837972f0c4e743e1a97bb11f4
Merge "Not used and causing problems, Goodbye!" into pac-4.4