Fix #10 - remove unnecessary helpers.

Fix #10 - remove unnecessary helpers.