Remove some variables and fix some nunjucks stuff