More hll cleanup