Remove Unnecessary renderTemplate calls

Here are some updates. For the most part things look pretty good. I'm sure there are better ways of doing some of this stuff, but nothing that really says "you're doing it wrong"