Removed extra buttons and tests.