Issue #516 Removing unnecessary helper file