Cleanup in HYT939 code.