Get rid of extra button and remove debug code.