Moar cleanup and derp fix

Change-Id: Ic91519a387299d03c91f60ea5e50706eb82d2adc