housekeeping and cleanups...