1 last hlte removal,...

Change-Id: I6b15a76d0422c5300a0134d0eb356755412c0541