more pointless cleanup

Change-Id: I33c9de46ef473284c5d5d493ea8e34d3382ad03d
Merge "more pointless cleanup"