Remove old includes
Add hosts to saved template to avoid blank redirection