Revert "Added missing helpers"

This reverts commit 83154d224f975dc0a6540ad2cf4cf063a466272d.