A little cleanup before bed...

Change-Id: Icb31ecf03cf576702fbe59e71c1972f641a5e2c8