Get rid of some nasty ERB
More ERB removal, new-style hashes