Getting rid of locals that are now defined in the helper files.