Clean up code

Change-Id: Ie0cb19dbf44b3caf118d8865cc16478a6eb1ee3f