Got rid of unnecessary buttons.