More cleanup

Change-Id: I74f34122c5ebde722feefd5691089f18155f165b
Merge "More cleanup" into pac-4.4