Code Cleanup

Change-Id: Id22c8d9f7ffc812bdd5eb9b1a04ac647378f663e