Revert "EFHF_final"

This reverts commit f21b63be99500347e80ec516400ff2ebd2d9e392.