msm8660: clean up part 2

Change-Id: If3be7afa6bcfc5a599b7f00a81d0e944c421043f