For HFCJ - version 0
Some cleanup.