More Crouton cleanup