Removed extra buttons