deleting unwanted buttons, more cleaning up