Cleanup menu callbacks for new structure with resample