Clean up a little

Change-Id: I604e2660deedcaf8552a26d070a3fd008c362a8f