Cleanup after wwu removeval.  Also enhanced menu.