Revert "0718_add_helper_funcs.."

This reverts commit 2bead0cf578471e56a7cc151919492a05b7a86dc.