some Cleanups