Remove named return vars