@NolanChan since we won't need a helper, can we remove this?