be: cleanup: remove legacy & upgrade format