Finally, some cleanup

Change-Id: Iabb576b0616083502731e26f960400477bd48004