some assorted cleanup