Code cleanup

Change-Id: I448bdf3a232e1cfc71a8a67e165f1ceda521ff85