cleanup HLC support