some cleanups
cbp