Moved back to using twig:clean