removed superfluous buttons, added their functionality elsewhere