some cleanups...