Clean up Gumbo variables in Makefile