Some cleanup

Change-Id: I0dfb5212b091cecc29ad76fd3501e724efef0619