Clean up the helpers
6 files changed