clean up and derp 4

Change-Id: Id78112cf0e96f59e9459adc08148342a00694029