miscellaneous cleanup