Some cleanup for the new template