various and sundry cleanup