Correct helpers and location, and remove template text.