Lose the unnecessary helper functions