cleanup misc #8