[PATCH] Cleanup SLHC configuration