more cleanup on my sloppy comits

Change-Id: I293efff1aec1e79e25b347d581dd7278388222cc