Cleaned up the dependency on the helper.