some cleanups
un-committed changes