* bbfoomp cleanup