clean up & more attempts to merge hlungtx1 & hlungtx2