some cleanups!