Some clean up and update dependencies to 4.3

Change-Id: Id45e6166bd75f0f89a5b2f935917649c40d9dd87