cleanup some sh...