moving to 23, cleaning up twig