some template clean up that wasn't of blocker significance