No more empty menu entries