Removed unnecessary buttons