delete get all button and clean up some of the extraneous code