assorted cleanup