clean up USE and stat prepend in bhcore