Clean up the BDS merge in order to get rid of the default addition
to the menu.

Signed-off-by: Al Stone <ahs3@redhat.com>