CC-5789 : Builder Cleanup

no need for this dialog check, put the buttons on all the time.