hltetmo: Cleanup and fix up

Change-Id: Id9f4ea494d99f12e4a5b4a0840f8e941b880177e