Some cleanup

Change-Id: I235a2cc5a70ba617a33704e25934fc44b8042308
Merge "Some cleanup"