OTA: Code cleanup

Change-Id: I83636231f233b36dcf4dea38353bf113d162831f
Reference: http://review.mfunz.com/4138