Cleanup of noob git mistakes

Change-Id: Ifb08a346997a8973ce0d4812661c32436e09861f