split hr and other cleanup