some cleanups

some cleanups

cleanup