miscellaneous clean-ups