bi some cleanups